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

Change-Id: I62a8c4284e072a277051baaeecb89f60c6fee6e4
parents 12b073ea eb212ac0
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