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