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