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

Change-Id: I7173473708fc1cf674b349091e5e5d95419ba886