[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 skip reason: subject contains skip directive Change-Id: Ie1f0703f9390fc793a6b6d3e277a5b03fec82faa
This commit is contained in: