[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev
am: c38c7db007
-s ours
am skip reason: subject contains skip directive
Change-Id: I868539d4063dbd3b9d4e014871b5ef0fe42b0325
main
commit
c993143422