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