tree 64ae2fa639ef501ef1b6b8e1195020dc80aab53c
parent 96f52cde23982f668592418a9548045237d5e327
parent ba7c35717116e4dcb8242644f6ccf07c25c7b251
author Andreas Huber <andih@google.com> 1273605674 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1273605674 -0700

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