am 7a00336c: am cfc7f1aa: Merge change 25382 into eclair
am 7a00336c: am cfc7f1aa: Merge change 25382 into eclair

Merge commit '7a00336cadace0f7c1a3151953709a739c073337'

* commit '7a00336cadace0f7c1a3151953709a739c073337':
  Fix async calls with Connect And Disconnect Sink.

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