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