am d34b7aab: (-s ours) 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

Browse Source

* commit 'd34b7aab38503a743e06f7e4e2c974e4d9716984':
  DO NOT MERGE: Apparently our native TCP sockets do not return an error from blocking "connect"

...

This commit is contained in:

Andreas Huber

2011-01-21 16:08:34 -08:00

committed by Android Git Automerger

parent a53086c088 d34b7aab38

commit 1c7ae5ac57

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available