[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: Iaf9f87ae5aab01ba07c15825d8551460ae810354
This commit is contained in:
am: 67afe87617
-s ours
am skip reason: subject contains skip directive
Change-Id: Iaf9f87ae5aab01ba07c15825d8551460ae810354