Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: 09c08d1da0
-s ours am: 8191079b21
-s ours
am: f931d88a0b
-s ours
am skip reason: subject contains skip directive
Change-Id: I9c658832c8fbfa2048d4bc23d0425fc9972fcede
This commit is contained in: