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