tree ffae76077c60634f5ac22ca046d6aee86e39005a
parent b2ea27743efb8f1751008d3bbc9fedf3a4e263f2
parent 30f2fc6a29ac819522ba70fa76135f86ad94a0dd
author Baligh Uddin <baligh@google.com> 1353107774 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1353107774 -0800

am 30f2fc6a: (-s ours) am 7d276e37: Import translations. DO NOT MERGE

* commit '30f2fc6a29ac819522ba70fa76135f86ad94a0dd':
  Import translations. DO NOT MERGE