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