Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: 67afe87617 -s ours am: c7b0ab4b49 -s ours
am: 45adb0424f -s ours
am skip reason: subject contains skip directive
Change-Id: Id02aeeec25df62c74c779e119da2ca3dd5ee62ea
This commit is contained in: