Skip to content
Commit 0362c252 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... 

[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: a2bee96a -s ours
am: c5bf72a7 -s ours
am skip reason: subject contains skip directive

Change-Id: Ieab9244337e3c72a62db5d069bdd91001ee84243
parents d851c0d8 c5bf72a7
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