am 9a87a838: (-s ours) am 5d42075e: Merge "DO NOT MERGE: Instead of asserting, remove active streams if their sockets" into ics-mr1

Browse Source

* commit '9a87a838028f3911a066a729cdb5ec688903a5ae':
  DO NOT MERGE: Instead of asserting, remove active streams if their sockets

...

This commit is contained in:

Andreas Huber 2011-11-11 11:51:11 -08:00 committed by Android Git Automerger

parent 21b916fae7 2d4a178249

commit 2a484e15af

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