| commit | 54500e5e15b8bc1fc646b7c79fee49ce075db614 | [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 | e6afbe52b57a3a4b454a39b237518542630e56db | |
| parent | a36d8caf15d56a75906e9cc75b5e04463c1317a6 [diff] | |
| parent | 8ae0f5562ae79fed534f12c340fdff7114c12c38 [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