tree d708a0f0d49c62de4ec342904b31173d3a26fc6c
parent 47e95086b7c0951f63ff9dfeeb026a26a9164320
parent c88eba105950ec2eea5b6cd420047684659d1837
author Baligh Uddin <baligh@google.com> 1351866892 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1351866892 -0700

am c88eba10: (-s ours) am 69e48cb6: Import translations. DO NOT MERGE

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