Skip to content
Commit 71abb3ce 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... 

[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: 577a5aa1 -s ours
am: e5cffc8b -s ours
am skip reason: subject contains skip directive

Change-Id: I33db0fe88e381802ae508c2d3a652600540afbb1
parents f4d70dc9 e5cffc8b
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