| commit | 9a87a838028f3911a066a729cdb5ec688903a5ae | [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 | d050451f9e03105923990264f376ef8163f2973a | |
| parent | 9c981cd3d53238f10842368c1cd82d625b701a47 [diff] | |
| parent | 5d42075e450a49af2bb37ca3a9610921df7607f2 [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