tree 5711bbfbc12325192b44db377651bff3dd720a10
parent de0ab19d57830f7db823439782a96418c228067d
parent 111b0b1d2ba290d7f84c6a3b0057b39834950cf5
author Baligh Uddin <baligh@google.com> 1350926029 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1350926029 -0700

am 111b0b1d: (-s ours) am acc0f2ee: am ee451392: Import translations. DO NOT MERGE

* commit '111b0b1d2ba290d7f84c6a3b0057b39834950cf5':
  Import translations. DO NOT MERGE