tree 3a88203e844418d8804e94cd44c14a9cb99482c9
parent 2ea1ea3b52462690e59abc5e55ac05617fe4d30c
parent 709a0f5931e08994099a0df9643d08b1479d192e
author Geoff Mendal <mendal@google.com> 1436358871 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1436358871 +0000

am 5aaefd0a: (-s ours) Import translations. DO NOT MERGE

* commit '5aaefd0a91a6158717588a56ead56823e4eb0012':
  Import translations. DO NOT MERGE