| commit | 3862c5a4ac16121538f66e2cf46ffc2b9b7ac50d | [log] [tgz] |
|---|---|---|
| author | Andreas Huber <andih@google.com> | Fri Jan 21 16:04:56 2011 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jan 21 16:04:56 2011 -0800 |
| tree | 3958add020049d932d7edb39bd154ab3815c66bf | |
| parent | 4c81192920777cd6884c6e4eeb4dea5f00451d88 [diff] | |
| parent | ea59c3e26a903af458cb1cadaeed869a99bf5680 [diff] |
am 66e35c24: (-s ours) am e9a00235: Merge "DO NOT MERGE: Apparently our native TCP sockets do not return an error from blocking "connect"" into gingerbread * commit '66e35c240e6105934e76cabfafed385f95f013ba': DO NOT MERGE: Apparently our native TCP sockets do not return an error from blocking "connect"