tree cf3a2c3c0510c226c55399419ee9eed532a41e9e
parent 21357612aa74134e856109a9bb4a1a545252090c
parent 19b9dd3e31e2e7deff759506f9442b08426b91d7
author Eric Fischer <enf@google.com> 1255479467 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1255479467 -0700

am 19b9dd3e: (-s ours) Import revised translations.  DO NOT MERGE

Merge commit '19b9dd3e31e2e7deff759506f9442b08426b91d7'

* commit '19b9dd3e31e2e7deff759506f9442b08426b91d7':
  Import revised translations.  DO NOT MERGE