tree b8f27efa8eba411d711cca0f677f5e7fe13a758e
parent 90b43ad3434402990e7fcf5e417bd4bfbff1d75a
parent 76229a7ccca69e92700f7b5f9d54739ee67276be
author Geoff Mendal <mendal@google.com> 1413206496 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1413206496 +0000

am 76229a7c: (-s ours) Import translations. DO NOT MERGE

* commit '76229a7ccca69e92700f7b5f9d54739ee67276be':
  Import translations. DO NOT MERGE