tree 3305d62334a47eb27ec7361ea58e8d392788bf1c
parent 8a480fbe5011a5fcc2e73d3b1abfbdd44a5bcbd9
parent 043c6737165ea8071a290ab7e9e01dac17935b9f
author Eric Fischer <enf@google.com> 1256246567 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1256246567 -0700

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

Merge commit '043c6737165ea8071a290ab7e9e01dac17935b9f' into eclair-mr2-plus-aosp

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