Skip to content
Commit 712ffbb9 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: 4ffaa9a2 -s ours am: a9cd5d94 -s ours
am: 18c98d52 -s ours
am skip reason: subject contains skip directive

Change-Id: I5ee9acf1a7af97b3d8400cd6b9cc6eed3d1065c6
parents 56b397e6 18c98d52
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