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