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