Skip to content
Commit 74f5559d 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-r1-dev 

am: 2611fba3 -s ours
am skip reason: subject contains skip directive

Change-Id: I883d2b4151d2512dadffb93981439b5f5025f526
parents a1a275e6 2611fba3
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