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

Change-Id: I24a508194017c106eb8e6e6411ad4f9952c307a4
parents d2098f84 577a5aa1
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