Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: 7892f729a5
-s ours am: 978cd2b768
-s ours
am: 1d13f5c8bb
-s ours
am skip reason: subject contains skip directive
Change-Id: Ie295d2b7759f41a84e2a9cc8718a1d405519a556
This commit is contained in: