tree 33c91150474ff16a6feda9d04e2bb56d938dbaeb
parent cb060573bb19d024f1dcf569b87756d78143456d
parent add08eb454bbe8b3a0a40d23621c102b72cd005d
author Andreas Huber <andih@google.com> 1271807006 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1271807006 -0700

am f5e20801: am 89e28cbe: am 9e609b0d: Merge "Apparently select() does not immediately return if one of the masked socket descriptors is closed... Stop relying on select for read-with-timeout functionality and use SO_RCVTIMEO socket option instead." into froyo