am e0dc80f8: Merge "Support for customizable socket-read timeouts through the HTTP response." into froyo

Merge commit 'e0dc80f878b56ed744bd06d341716fcfff4e3acc' into froyo-plus-aosp

* commit 'e0dc80f878b56ed744bd06d341716fcfff4e3acc':
  Support for customizable socket-read timeouts through the HTTP response.