tree 9eb79b70c53686971f52662b8104cb49a86ea020
parent 8d928c77a61efc0b50930cb9f7f6887fed1995a7
parent 8f85e85d24648f55d2a18538045f52626cc83fd9
author Geoff Mendal <mendal@google.com> 1436979735 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1436979735 +0000

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

* commit '8f85e85d24648f55d2a18538045f52626cc83fd9':
  Import translations. DO NOT MERGE