| commit | 2d4a178249563732a249d23c46ab1dc0b0fd4f92 | [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 | d660719b16f28797e0fd81ac00a7b5f15272781d | |
| parent | 9ba00d828475a31a0a02a3080b32db068fdb4998 [diff] | |
| parent | 2373ecfc110e9dd65bc8a4f2370f2fda5db11ce4 [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