Skip to content
Commit eb212ac0 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: 6c70f269 -s ours
am skip reason: subject contains skip directive

Change-Id: Ie18363997e5bef1c4edb8d633208dd132f69be53
parents ed75b868 6c70f269
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