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