tree b76f7f9bfeea20819931e7f6bb443cd3525b2258
parent a68e17a35ed5b8bd05504a195d17737415f624ba
parent a8e033d1ff1c81d68f54a7ac894db7058c7642f6
author Geoff Mendal <mendal@google.com> 1438446841 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1438446841 +0000

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

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