[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: c5999bd8d7
-s ours
am: 51eaf198ef
-s ours
am skip reason: subject contains skip directive
Change-Id: I7dafb531aafde66c3cb48163f80e2b3578410828
main
commit
5bb4b60470