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