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