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