diff options
| author | Andreas Huber <andih@google.com> | 2010-06-11 10:58:44 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-06-11 10:58:44 -0700 |
| commit | 0905ba7ba62567c1d1b5b0567827c35d40390b52 (patch) | |
| tree | 96e310f94ea9e821d364387b3a724791280ad474 /core/java/com | |
| parent | b165719e93dd390b4f71f5d5e993880529cc841f (diff) | |
| parent | f5eafe40cd3f0890dd4ce98a63c8f95b786a3dd9 (diff) | |
| download | frameworks_base-0905ba7ba62567c1d1b5b0567827c35d40390b52.zip frameworks_base-0905ba7ba62567c1d1b5b0567827c35d40390b52.tar.gz frameworks_base-0905ba7ba62567c1d1b5b0567827c35d40390b52.tar.bz2 | |
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.
Diffstat (limited to 'core/java/com')
0 files changed, 0 insertions, 0 deletions