tree 7d5330152c49ca35fd3948d913acff0edebb6230
parent 6698344e3d23e13df2274c0a895fd1c41d0275d8
parent 87793027d46fec893eff4f02e4d7218cafdcb85e
author Jaikumar Ganesh <jaikumar@google.com> 1261433983 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1261433983 -0800

am 87ed10d7: Merge change I577dd1f3 into eclair

Merge commit '87ed10d78d290f48d382a6e628241da0c61cfb45' into eclair-plus-aosp

* commit '87ed10d78d290f48d382a6e628241da0c61cfb45':
  Accept incoming connections if no other sink is in NonDisconnecting state.