Skip to content
Commit 34f88bfe 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: 801d1779 -s ours 

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

Change-Id: Iac808d2c1042f00c600b24a28d2962e5ee350665
parents bbb0db16 da046065
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