am 096a1e6c: am 8b525c07: Merge "Check for state before disconnecting." into gingerbread
am 096a1e6c: am 8b525c07: Merge "Check for state before disconnecting." into gingerbread

Merge commit '096a1e6c83d3638788468dfb21a3b4662745d617'

* commit '096a1e6c83d3638788468dfb21a3b4662745d617':
  Check for state before disconnecting.

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