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