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

Merge commit 'f84207f6ca90307b10d94e484baf55330d644c1d' into kraken

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

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base