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

Change-Id: If60e3e6e1949a8cd0d49a48b1a3ed4ad5281961f