am c6af69b2: Merge "Add an extra for the Disconnect Headset State." into froyo

Merge commit 'c6af69b2684e1a95368f52e1f1614595f85c9c12' into froyo-plus-aosp

* commit 'c6af69b2684e1a95368f52e1f1614595f85c9c12':
  Add an extra for the Disconnect Headset State.