am 2afe0611: am e6e81004: Merge "Cleanup on async disconnect and finalize" into jb-mr1-dev
am 2afe0611: am e6e81004: Merge "Cleanup on async disconnect and finalize" into jb-mr1-dev

* commit '2afe06114c3eaa6aef0a442275392d44a43b64f5':
  Cleanup on async disconnect and finalize

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