am e9a00235: Merge "DO NOT MERGE: Apparently our native TCP sockets do not...
am e9a00235: 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"