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