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