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