Skip to content
Commit 6f47e128 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: 6f1fc7fd -s ours
am skip reason: subject contains skip directive

Change-Id: I41e1560312cddc53029f10040e2dd25daf33b975
parents 15e3beb0 6f1fc7fd
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