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