tree 3305d62334a47eb27ec7361ea58e8d392788bf1c
parent 742d0908cb44b8d1ff62aaf4138046c6f16f95bc
parent 9f49d26ded41676c96289523be75063395a5cf1c
author Eric Fischer <enf@google.com> 1256263440 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1256263440 -0700

am 9f49d26d: am 043c6737: am ed10d655: Merge change Ia98fd30d into eclair

Merge commit '9f49d26ded41676c96289523be75063395a5cf1c'

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