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