Skip to content
Commit 4d3fccca 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... 

[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: c7a7eaa7 -s ours
am: b3c1bb04 -s ours
am skip reason: subject contains skip directive

Change-Id: I90fe6c601de54f0583e7f1075601e8c05a190c81
parents c253637d b3c1bb04
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