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