tree c1ee11e8a383d8de9a4b4b4332660cd55a4e408e
parent da1253b438363bda05206c1b77dbd9db03275254
parent 1e0ecf870fbadd98ed0ec5cb9192f41a663d38cc
author Geoff Mendal <mendal@google.com> 1436196775 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1436196775 +0000

am 1e0ecf87: (-s ours) am 99f71e0f: (-s ours) am 0356bca6: (-s ours) Import translations. DO NOT MERGE

* commit '1e0ecf870fbadd98ed0ec5cb9192f41a663d38cc':
  Import translations. DO NOT MERGE