tree dbee8472d8fa974dbd74a2557ae47da1a28c3832
parent 3c8a0f30d3e397a994a18d33611d2964a85c4939
parent 4e18fb99c8db3ef6b68df18dbcec6c5313c82470
author Geoff Mendal <mendal@google.com> 1436979786 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1436979786 +0000

am 4e18fb99: (-s ours) am 98ec64cc: (-s ours) am b778fdff: (-s ours) am 624275b5: (-s ours) Import translations. DO NOT MERGE

* commit '4e18fb99c8db3ef6b68df18dbcec6c5313c82470':
  Import translations. DO NOT MERGE