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