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