Skip to content
Commit 8939af9a 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: 9b5cfc03 -s ours
am skip reason: subject contains skip directive

Change-Id: I31345146c681b1caededa5de6dcb231324e8e3f9
parents 99a10329 9b5cfc03
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