[automerger skipped] Merge "Import translations. DO NOT MERGE" into...

[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 79f35238 -s ours am: 3fc58ee5 -s ours am: 1edaa5ef -s ours am: 5b2ed73f -s ours am: 9b2b9ac5 -s ours am: a27c048d -s ours

am skip reason: subject contains skip directive

Change-Id: Ifab7a12d7150bf6c211b577c9c547aea9a640e8d