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