Skip to content
Commit 6db6f376 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: 801d1779 -s ours am: b87c62f3 -s ours
am: 585f5f22 -s ours
am skip reason: subject contains skip directive

Change-Id: I29e7815de2fa52015832f519048b4b13e63036aa
parents 9dce775b 585f5f22
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