Skip to content
Commit 9c6483c1 authored by Bill Yi's avatar Bill Yi Committed by android-build-merger
Browse files

Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into... 

Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 3b7a08e3 -s ours am: 843ab671 -s ours
am: 32ca0580 -s ours
am skip reason: subject contains skip directive

Change-Id: I6a7bc76788bca5a568e3cb6a42dd9555d4d145ea
parents 3d914b56 32ca0580
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