Skip to content
Commit 95013b0b authored by Bill Yi's avatar Bill Yi Committed by android-build-merger
Browse files

Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into... 

Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: c760a652 -s ours am: fcb0fc43 -s ours
am: 3d728354 -s ours
am skip reason: subject contains skip directive

Change-Id: I030d826db98ad90f3dd6925718fdcf914b3e1a56
parents ca4b6752 3d728354
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