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