am bfcfb7ee: Merge change 22302 into eclair
am bfcfb7ee: Merge change 22302 into eclair

Merge commit 'bfcfb7eec61bd196cfd91f7b2c5715751308c048' into eclair-plus-aosp

* commit 'bfcfb7eec61bd196cfd91f7b2c5715751308c048':
  Set BondState to Canceled when user cancels pairing.

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