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