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