Commit 7c609c0c 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-dev 

am: abff0ad0 -s ours
am skip reason: subject contains skip directive

Change-Id: I82d7a41da78f4ee69f786cfa7a7681ea21438af1
parents c70c3a32 abff0ad0
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