am 1aa25597: am 87ed10d7: Merge change I577dd1f3 into eclair

Browse Source

Merge commit '1aa2559797d49fa0c6cf7885c9fed5797e42231f'

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

...

This commit is contained in:

Jaikumar Ganesh 2009-12-21 14:22:37 -08:00 committed by Android Git Automerger

parent b46c807d43 d9f1241527

commit e00381d73c

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available