[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: dd6e85b216
-s ours am: 1245d88a9f
-s ours am: dd5ea62c49
-s ours
am skip reason: subject contains skip directive Change-Id: I39587c43661f83bf126bcba2be46a724504291c8
This commit is contained in: