[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 8f1b7c7702 -s ours
am: d4abcd0f46 -s ours
am skip reason: subject contains skip directive
Change-Id: I9e0669e958eeb40344d4b7a80d7263dd712e466c
This commit is contained in: