tree 53d7d3ad694f734aa688509c20d288fa7416e932
parent 93057e20f3bdcfa368b662049bdd13c9d47cc4b4
parent 3862c5a4ac16121538f66e2cf46ffc2b9b7ac50d
author Andreas Huber <andih@google.com> 1295654914 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1295654914 -0800

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

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