[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev
am: 67afe87617
-s ours
am skip reason: subject contains skip directive
Change-Id: I93b1d7c914e939f3a33676bb8baed83da547bdb5
This commit is contained in:
am: 67afe87617
-s ours
am skip reason: subject contains skip directive
Change-Id: I93b1d7c914e939f3a33676bb8baed83da547bdb5