tree 3f366956f65d433610b52e4c7722a41c45af419e
parent 65f8e1cf86d061391f313c8e73e21056c6132b83
parent fbb9146f0a57084e8e5347aab0faec2e6f12b69a
author Eric Fischer <enf@google.com> 1258163591 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1258163591 -0800

am fbb9146f: (-s ours) Merge change I452e3a4c into eclair

Merge commit 'fbb9146f0a57084e8e5347aab0faec2e6f12b69a' into eclair-mr2

* commit 'fbb9146f0a57084e8e5347aab0faec2e6f12b69a':
  Import revised translations.  DO NOT MERGE