Commit 62880feb 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: 6b7a42eb -s ours
am skip reason: subject contains skip directive

Change-Id: I2c38e94cb07c35d148e7dfaca94b6a7e5ec4d09d
parents 7c609c0c 6b7a42eb
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