tree 104ff11f3a4d220f6da0d61b5e06246e5a29acf2
parent aa663206b93e47215600fbb23428d63e8f4a7a68
parent 9eab12e8c40a05d73e917490c9a5db336bc1d0fd
author Eric Fischer <enf@google.com> 1260495763 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1260495763 -0800

am 282a7423: (-s ours) Merge change I3c299167 into eclair

Merge commit '282a742347bcb673f278c56b4dfede328a655296' into eclair-mr2

* commit '282a742347bcb673f278c56b4dfede328a655296':
  Import revised translations.  DO NOT MERGE