tree b08c14f930ef7340b2acb0ae9cdafe758d860857
parent 43b84dcd7be5bdde8279c820d1706bed80a165a3
parent 4099df64e3aae5a0475d5e22074497900d9459b7
author Kenny Root <kroot@google.com> 1287423143 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1287423143 -0700

am 4099df64: (-s ours) am b141d86c: Import revised translations DO NOT MERGE

Merge commit '4099df64e3aae5a0475d5e22074497900d9459b7'

* commit '4099df64e3aae5a0475d5e22074497900d9459b7':
  Import revised translations DO NOT MERGE