Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: e801eb78f0
-s ours am: ffe1c80f35
-s ours
am: 6f4a9d32bb
-s ours
am skip reason: subject contains skip directive
Change-Id: I1d56a79559cfb30c8c8c3e6b363245115c8f2254
This commit is contained in:
commit
e6a4abfd3c