tree 23d8f3f90972db7e5dd00b89dd89b9740024e0bc
parent 5e94e19c1fe0a4379348b392d5f2cbc52b304bb5
parent 85e5c1968bf05c19307e5663c5b5afd062ca8753
author Geoff Mendal <mendal@google.com> 1415913008 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1415913008 +0000

am 85e5c196: (-s ours) am a81b1cad: (-s ours) am 4cc7bbc9: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev

* commit '85e5c1968bf05c19307e5663c5b5afd062ca8753':
  Import translations. DO NOT MERGE