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