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