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