[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev
am: 5d962cfa05
-s ours
am skip reason: subject contains skip directive
Change-Id: I3b2e75974e58d5822c248ecb18ff7f0fbfc98178
main
commit
1eced9d815