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

Change-Id: I2d4e4be46226bcc1dd5e6087ae5b3714ad8c709e
parents 7344796b dc20f9ae
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