tree cbcc65817de4b179145f5ba7a0e3a1db394c0c6c
parent e577e87a2d80890190f14edc4a5caf70d7c566bf
parent 3a53dc5ad9c2fa808b87195cfde9f3a065d6fa5b
author Andreas Huber <andih@google.com> 1276278720 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1276278720 -0700

Merge "Restore feature parity with the old HTTPDataSource as far as support for extra headers (cookies?) and socket-timeout are concerned." into kraken