tree 7c30c08c2978d6b80a7bb206ebd615d804bd2ef3
parent 386a098b7cbd6ad1d6f02e0a6668ffa50dd653c1
parent 40219c5da3edc461c05c87086cb0f5e56a7fbe4d
author Eric Fischer <enf@google.com> 1305144540 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1305144540 -0700

am 40219c5d: (-s ours) am 237d9b29: Import revised translations.  DO NOT MERGE

* commit '40219c5da3edc461c05c87086cb0f5e56a7fbe4d':
  Import revised translations.  DO NOT MERGE