tree 6434cfc582ea1b479ab9a3335b816b67082c4d82
parent 1500ee0522436b11cae8f6ec240c98fa1144b5c8
parent eb0be29edc8e7144f529da9ce0b20312de699329
author Geoff Mendal <mendal@google.com> 1436828426 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1436828426 +0000

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

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