tree 8d003d12046c5f6b8bae04c47da3c5ddc41b15df
parent 55df44f127375f3ce6bf310d327fffc187ec8f39
parent 9b8b1ef98a8026afb5b1ff165271d94d5706a49a
author Eric Fischer <enf@google.com> 1259795553 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1259795553 -0800

am 9b8b1ef9: (-s ours) Merge change If84681a3 into eclair

Merge commit '9b8b1ef98a8026afb5b1ff165271d94d5706a49a' into eclair-mr2

* commit '9b8b1ef98a8026afb5b1ff165271d94d5706a49a':
  Import revised translations.  DO NOT MERGE