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