tree ed25d95184eaaa7a2e20a50f00bdec65ca105a11
parent aaf83974b994e3e61b0bf43c8473fd5ad6b6f7c0
parent 37749ea37032043687c7dab552d961ba6245bd08
author Baligh Uddin <baligh@google.com> 1388116257 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1388116257 -0800

am 37749ea3: (-s ours) Import translations. DO NOT MERGE

* commit '37749ea37032043687c7dab552d961ba6245bd08':
  Import translations. DO NOT MERGE