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:
21eb039
3469d55
)
am b003ad17: am e0dc80f8: Merge "Support for customizable socket-read timeouts throug...
author
Andreas Huber
<andih@google.com>
Wed, 12 May 2010 14:55:48 +0000
(07:55 -0700)
committer
Android Git Automerger
<android-git-automerger@android.com>
Wed, 12 May 2010 14:55:48 +0000
(07:55 -0700)
Merge commit '
b003ad17bffeba7875b9708ffeef2300ef28c916
' into kraken
* commit '
b003ad17bffeba7875b9708ffeef2300ef28c916
':
Support for customizable socket-read timeouts through the HTTP response.
Trivial merge