Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: 8d5ac64187
-s ours am: 3b0a4a9282
-s ours
am: 3be482dffd
-s ours
am skip reason: subject contains skip directive
Change-Id: I268b68ba97b34dca6fdfefc93901ee8cb658500e
main
commit
0a1ca27859