Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 7604e64ecc
-s ours am: 48fd3d016a
-s ours am: a68bdf59af
-s ours
am: bc508606fc
-s ours
am skip reason: subject contains skip directive
Change-Id: Ib702b9e34fde23353055aa9915b9fca8249d6280
main
commit
a3b0683a17