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