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