am e9a00235: (-s ours) Merge "DO NOT MERGE: Apparently our native TCP sockets...
am e9a00235: (-s ours) Merge "DO NOT MERGE: Apparently our native TCP sockets do not return an error from blocking "connect"" into gingerbread
* commit 'e9a00235':
DO NOT MERGE: Apparently our native TCP sockets do not return an error from blocking "connect"