[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 41c7e07d12
-s ours am: 0bc3df3750
-s ours
am: dc9a31d129
-s ours
am skip reason: subject contains skip directive
Change-Id: I59e1de1eaa7965ddaaf4a04828d0e64a2865125b
main
commit
70464fca0e