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