tree e3e1b775d2e5340dbfce10cfbdb606ef6fa8ad60
parent f5ef7f22bbf73ba5c3910096f8f7f84cc6e21039
parent d2333bda49f9d76f1b30b81dfc093d407bc6dbf0
author Andreas Huber <andih@google.com> 1273676148 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1273676148 -0700

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

Merge commit 'b003ad17bffeba7875b9708ffeef2300ef28c916' into kraken

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