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