tree 72b6d2b20af4fccf6cf6b91a679fe652c87111cb
parent 474c4b4a785c67cd41c214f137bf4f1714366a30
parent 039e92f7cfe121ff0c7de757a3b2bbc82577e3a1
author Geoff Mendal <mendal@google.com> 1436980119 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1436980119 +0000

am 039e92f7: (-s ours) Import translations. DO NOT MERGE

* commit '039e92f7cfe121ff0c7de757a3b2bbc82577e3a1':
  Import translations. DO NOT MERGE