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