Skip to content
Commit aae5671b 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 

am: e6283fda -s ours
am skip reason: subject contains skip directive

Change-Id: I9e814d15fdf82faae92e02a216f5d4bf6ba19ac0
parents e6fb43cf e6283fda
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