tree 5babd8338e5cd14b2492ab6013943919e004ae43
parent 6a9ad3d6ab8ffb02c5c349f8dea4aef2649b491d
parent 90259792f3bdd5e8852d1cb5d536ef9a68237f18
author Baligh Uddin <baligh@google.com> 1408985726 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1408985726 +0000

am 90259792: (-s ours) am 3640e476: (-s ours) Import translations. DO NOT MERGE

* commit '90259792f3bdd5e8852d1cb5d536ef9a68237f18':
  Import translations. DO NOT MERGE