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

Change-Id: I47a790cc20e24c32be171b9d090ac2d9c8906ae8