tree 74744a31f6e175d775560e90cf897a1efec4d60f
parent e57850149166aac5390cb50cabfc01f41ddc2ef1
parent 175830cfea571c27a85a81d3f4cae05246be919e
author Geoff Mendal <mendal@google.com> 1436193324 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1436193324 +0000

am 88b4a0ac: (-s ours) Import translations. DO NOT MERGE

* commit '88b4a0ac56a2a006af2b8702c4c36590b287fcda':
  Import translations. DO NOT MERGE