Commit e4d497bd 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: eaadb371 -s ours
am skip reason: subject contains skip directive

Change-Id: I1758c28ef1ecc9edbdedb8e2acbbcaf928f8173f
parents d820cc2e eaadb371
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment