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