OSDN Git Service
(root)
/
android-x86
/
frameworks-native.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
0ca952c
9812b9c
)
am f5eafe40: Merge "Restore feature parity with the old HTTPDataSource as far as...
author
Andreas Huber
<andih@google.com>
Fri, 11 Jun 2010 17:58:44 +0000
(10:58 -0700)
committer
Android Git Automerger
<android-git-automerger@android.com>
Fri, 11 Jun 2010 17:58:44 +0000
(10:58 -0700)
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.
Trivial merge