[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: d1defa1bdf -s ours am: 13164367b5 -s ours
am: f175f5d842 -s ours
am skip reason: subject contains skip directive
Change-Id: I347e88a8ad76d2c2ffe03f6af9c8c136d3e6e37c
This commit is contained in: