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