[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: 1fdf42430a
-s ours am: ac51b9e890
-s ours
am skip reason: subject contains skip directive Change-Id: I0d5b267f0dd0b98e46242f084490a0d92cfd8b17
This commit is contained in: