| commit | 8ae0f5562ae79fed534f12c340fdff7114c12c38 | [log] [tgz] |
|---|---|---|
| author | Andreas Huber <andih@google.com> | Fri Nov 11 11:47:58 2011 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Nov 11 11:47:58 2011 -0800 |
| tree | c4acc6eecf6e65fcbc6c1439fec5d1c23190053e | |
| parent | 87f685560f302ec511781b2f1b688600e7ecc5fd [diff] | |
| parent | 4ab3045755d33ab24bd312cfbc888f300c5e01f9 [diff] |
am 5d42075e: Merge "DO NOT MERGE: Instead of asserting, remove active streams if their sockets" into ics-mr1 * commit '5d42075e450a49af2bb37ca3a9610921df7607f2': DO NOT MERGE: Instead of asserting, remove active streams if their sockets