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