| commit | 7d867210eeedc7f77852323cad986f2faa095200 | [log] [tgz] |
|---|---|---|
| author | Andreas Huber <andih@google.com> | Fri Jun 11 10:58:44 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jun 11 10:58:44 2010 -0700 |
| tree | ba7baa1cbc2a4ab93b7523a90df9c8b132aab577 | |
| parent | 0ca952c7abd6451a0fa9e6aefbc48263aa833d10 [diff] | |
| parent | 9812b9ce779f1b469b65fc302be856a3992e7495 [diff] |
am f5eafe40: Merge "Restore feature parity with the old HTTPDataSource as far as support for extra headers (cookies?) and socket-timeout are concerned." into kraken Merge commit 'f5eafe40cd3f0890dd4ce98a63c8f95b786a3dd9' into gingerbread-plus-aosp * commit 'f5eafe40cd3f0890dd4ce98a63c8f95b786a3dd9': Restore feature parity with the old HTTPDataSource as far as support for extra headers (cookies?) and socket-timeout are concerned.