tree 2ff5e2ea2f68853860efd157d49cf9bef3a31a7d
parent a3da20cd7214d050e3b7d71270c2b718f73e2fc6
parent 1ec78606d2bf4dadbfbca4dea699007c2f93e25c
author Geoff Mendal <mendal@google.com> 1406813339 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1406813339 +0000

am 1ec78606: (-s ours) am 499a4be2: (-s ours) Import translations. DO NOT MERGE

* commit '1ec78606d2bf4dadbfbca4dea699007c2f93e25c':
  Import translations. DO NOT MERGE