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

Change-Id: If93c8317e9b2d1beb1eb98d158905108a880fdc0
parents b3995514 a731c593
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