tree 7bad41ff5f5f2fca5d25dc4c953d6ed26bd9f3ff
parent f3973456f43255ec5f72764734c5181294e958e3
parent 653e3ce35aa6167a25482db909452a81dd0fa860
author Geoff Mendal <mendal@google.com> 1436800178 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1436800178 +0000

am 653e3ce3: (-s ours) Import translations. DO NOT MERGE

* commit '653e3ce35aa6167a25482db909452a81dd0fa860':
  Import translations. DO NOT MERGE