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

Change-Id: Iec947684350b8ddc0c92f0009aafed80afacb3f5