tree 061ec8a1f08f119dac1d5d6a1504687335c762fc
parent 3717cf6bc2e92d58d8de9f039165d1e6c73de8a0
parent 2f9807b8d71fdc1a2336c22e89148325281b684e
author Baligh Uddin <baligh@google.com> 1371349222 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1371349222 -0700

am 2f9807b8: Import translations. DO NOT MERGE

* commit '2f9807b8d71fdc1a2336c22e89148325281b684e':
  Import translations. DO NOT MERGE