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

Change-Id: I7e86585ab4889e0c764b5ea09f8bb3053dde7c42