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