Skip to content
Commit ff1829fd 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: 5de09b24 -s ours
am skip reason: subject contains skip directive

Change-Id: I142d13ec2b46bfa0142778c577922bca6f7b1965
parents 966e5e3f 5de09b24
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