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