[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev
am: 00f42c18e7
-s ours
am skip reason: subject contains skip directive
Change-Id: I6a6fe8eb2230651eca9ffb05064320739b424481
main
commit
6aecddb456