Skip to content
Commit 4700cc1c 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-qpr1-dev 

am: e2529e74 -s ours
am skip reason: subject contains skip directive

Change-Id: I96610c95549a5073975227be01ba8f4a860c9f38
parents 026873c5 e2529e74
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