| commit | 5dd4c6bcb4f477d5500c61fda9b460299d825975 | [log] [tgz] |
|---|---|---|
| author | Andreas Huber <andih@google.com> | Fri Nov 11 11:51:11 2011 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Nov 11 11:51:11 2011 -0800 |
| tree | 2ae0aaeb3967b5271bfad42def318fbf04d098b2 | |
| parent | ff0bd468d8cf0f51c07927c758563a3f696c32a4 [diff] | |
| parent | 9a87a838028f3911a066a729cdb5ec688903a5ae [diff] |
am 9a87a838: (-s ours) am 5d42075e: Merge "DO NOT MERGE: Instead of asserting, remove active streams if their sockets" into ics-mr1 * commit '9a87a838028f3911a066a729cdb5ec688903a5ae': DO NOT MERGE: Instead of asserting, remove active streams if their sockets