tree f101a6d20477905d87603a1376d7024e1141509f
parent 82641c6654776bf687531aa211c3a282192ce40a
parent f1ac0f429611b19870c665d4ec4f1f93e5162c70
author Baligh Uddin <baligh@google.com> 1345502376 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1345502376 -0700

am f1ac0f42: (-s ours) am 91ca68b9: Import translations. DO NOT MERGE

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