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