Commit 23ae47a8 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: de521e7d -s ours
am skip reason: subject contains skip directive

Change-Id: I804d5f8b5e11aa55b1a65ca3b62bf4887858b2bd
parents 7637645f de521e7d
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