[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 6b7a42ebf2
-s ours
am: 62880febef
-s ours
am skip reason: subject contains skip directive
Change-Id: I022a0f63e2f73f42acba9ef1976eda5223bb0972
main
commit
2a33dbf0fa