| commit | 00332ee3b3e2c779d17fe034d25a076b921f7f6c | [log] [tgz] |
|---|---|---|
| author | Andreas Huber <andih@google.com> | Thu Jan 27 18:38:21 2011 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jan 27 18:38:21 2011 -0800 |
| tree | 96dcc816650047f9bd54ed5c4dd57b2564997db4 | |
| parent | c63e5259dcb77fc720c23bc2d0c4feeb3d677f71 [diff] | |
| parent | f4c056aeacad2dac60a83ccd7928bfeaa9d6ddf6 [diff] |
am e9a00235: (-s ours) Merge "DO NOT MERGE: Apparently our native TCP sockets do not return an error from blocking "connect"" into gingerbread * commit 'e9a00235c102d198a702bc665b2ea5b5e8c4bc07': DO NOT MERGE: Apparently our native TCP sockets do not return an error from blocking "connect"