[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev
am: 60dc13442b
-s ours
am skip reason: subject contains skip directive
Change-Id: I0ca61b0f5fcb090967b169b2e6710ef5dafa1b43
main
commit
00a939c043