tree 3305d62334a47eb27ec7361ea58e8d392788bf1c
parent 5f68de7a6783535aad877a33c090e0b0ce8e0791
parent ed10d65582fda0d78bb9707f71bc56a0387d735f
author Eric Fischer <enf@google.com> 1256246099 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1256246099 -0700

am ed10d655: Merge change Ia98fd30d into eclair

Merge commit 'ed10d65582fda0d78bb9707f71bc56a0387d735f' into eclair-mr2

* commit 'ed10d65582fda0d78bb9707f71bc56a0387d735f':
  Restore missing string that was still referenced from code.