Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: 8b9c85f0cd
-s ours am: 957463ca00
-s ours
am: 1639371bcd
-s ours
am skip reason: subject contains skip directive
Change-Id: Ie32b100cdb5015e788e9ed5c14f90a0c5d437421
This commit is contained in: