am 9e609b0d: Merge "Apparently select() does not immediately return if one of...

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

Merge commit '9e609b0d' into froyo-plus-aosp

* commit '9e609b0d':
  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.