Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 033d7caf95 -s ours
am: 091970a592 -s ours
am skip reason: subject contains skip directive
Change-Id: Id4125a45bb82c995ea3a7e1b6befa6495f737b31
This commit is contained in: