tree ac1420553126c7167abcc6673ec0d68499e881fa
parent 155e90e8f6d53218a132f641583ad3a1c4ea9769
parent 6e81f5fcf51c37275cfe006c820a06d8517a3cce
author Geoff Mendal <mendal@google.com> 1413226784 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1413226784 +0000

am 6e81f5fc: (-s ours) am 9735cbd1: (-s ours) am 29be6698: (-s ours) Import translations. DO NOT MERGE

* commit '6e81f5fcf51c37275cfe006c820a06d8517a3cce':
  Import translations. DO NOT MERGE