tree 467944bfe471d63f3a3f955e2024dad0f8feb1b1
parent b99d00b9f371c72ce2e18fb83b6a53952f58eecb
parent 3ab2ee79232cbde7f23021742202ef32b2b2918e
author Baligh Uddin <baligh@google.com> 1379220747 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1379220747 -0700

am 3ab2ee79: (-s ours) am bab13dba: (-s ours) Import translations. DO NOT MERGE

* commit '3ab2ee79232cbde7f23021742202ef32b2b2918e':
  Import translations. DO NOT MERGE