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