Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 8c9c8a6939 -s ours am: 0dd46f1e35 -s ours
am: 71c25b3ef5 -s ours
am skip reason: subject contains skip directive
Change-Id: I6e6b5af14e92858cdb4d37bc4014369d96127ca8
This commit is contained in: