Commit 5c0d577d 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: fe2d421f -s ours
am skip reason: subject contains skip directive

Change-Id: I2b7c8c005bb0d174a451243b9f0b4148f6c427bb
parents 331cdb72 fe2d421f
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment