commit | aead99ac3de0ef819509ff8301812086b8878480 | [log] [tgz] |
---|---|---|
author | Andreas Huber <andih@google.com> | Wed Jun 08 17:03:17 2011 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jun 08 17:03:17 2011 -0700 |
tree | 83782c70e05463d7dde8924ea545e9c503398211 | |
parent | fe0143ce6306d48d0f2850ecdd89d649018bcf5f [diff] | |
parent | 1676bf95dfdfcff72afadb9ddfc1b1d162dd0812 [diff] |
am 752a5b3d: (-s ours) am 8e973729: (-s ours) am 8050a02b: DO NOT MERGE: Linux sockets are odd, closing a socket descriptor does not abort pending recv/send calls. * commit '752a5b3df55da655792d382025171d94073e05f9': DO NOT MERGE: Linux sockets are odd, closing a socket descriptor does not abort pending recv/send calls.