Skip to content
Commit 6ea41cb0 authored by Bill Yi's avatar Bill Yi Committed by android-build-merger
Browse files

[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev 

am: 650d3a13 -s ours
am skip reason: subject contains skip directive

Change-Id: If57b94e48ee96d4fcdae85cd0550319f30199bf0
parents 544896bd 650d3a13
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment