tree f2f751b6e6c0f25b64241d0894df4fa8aff3b18b
parent 5053abb0eb1cadc0dd13f135f6129b22c74207ca
parent 4356e281037c51e8d0a92e8e93c11e5ee58e1dd2
author Geoff Mendal <mendal@google.com> 1436381819 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1436381819 +0000

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

* commit '4356e281037c51e8d0a92e8e93c11e5ee58e1dd2':
  Import translations. DO NOT MERGE