tree 5711bbfbc12325192b44db377651bff3dd720a10
parent ae282acc6580d536d9ca095cbaabfe7dd6488910
parent fe5c9bdd74fd77d8935580d528c9396257b06041
author Baligh Uddin <baligh@google.com> 1350925864 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1350925864 -0700

am fe5c9bdd: (-s ours) am 303f2f16: Import translations. DO NOT MERGE

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