tree d14ba40cf46738e40d7947a078dd587dfb440fba
parent 37e1df349aa76d79dca0c379ab1768dcec50ea94
parent 7ee8a992ecd703b84938f54860801254d2b47924
author Geoff Mendal <mendal@google.com> 1436801496 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1436801496 +0000

am 7ee8a992: (-s ours) am a187be6a: (-s ours) Import translations. DO NOT MERGE

* commit '7ee8a992ecd703b84938f54860801254d2b47924':
  Import translations. DO NOT MERGE