tree 85fc5b20702a6ce11b47e515700f7b1b2d332bdf
parent 77fc6ac5f6bb2c059f15b0bc9fd1ff02102b02fa
parent c7b0a8162520ffedcfcddb86d1f0e394513b7cf1
author Geoff Mendal <mendal@google.com> 1443617475 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1443617475 +0000

am c7b0a816: (-s ours) am 49b491bb: (-s ours) am 2e095fa2: (-s ours) Import translations. DO NOT MERGE

* commit 'c7b0a8162520ffedcfcddb86d1f0e394513b7cf1':
  Import translations. DO NOT MERGE