[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev
am: de31e5ecf2 -s ours
am skip reason: subject contains skip directive

Change-Id: I5bd9274a34ab2f5c237d4eed5d9660084bc24040