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