tree eeda10c963452b62213b7ad29643a39dd41753ab
parent e7f64b00d6141a1216bcfb69b5b4db0dc4cd328e
parent d471e50f970a284026d890418bbdec654236681a
author Baligh Uddin <baligh@google.com> 1350446911 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1350446911 -0700

am d471e50f: (-s ours) am a4219f28: am ca429b50: Import translations. DO NOT MERGE

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