[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 5d962cfa05
-s ours
am: 1eced9d815
-s ours
am skip reason: subject contains skip directive
Change-Id: If559a1a08bdd5f38f42439d265a67dea756a6aa1
main
commit
b36c49ba12