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