[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
am: 7630c6c549
-s ours
am skip reason: subject contains skip directive
Change-Id: I007c4656a5931249aa353f0b5b54e88189f052e6
main
commit
ffeda6dcef