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