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:
fb2dbb6
f734b65
)
am 8899186b: Merge "Timeout on socket recv calls after 5secs, retry connection also...
author
Andreas Huber
<andih@google.com>
Tue, 30 Mar 2010 20:34:39 +0000
(13:34 -0700)
committer
Android Git Automerger
<android-git-automerger@android.com>
Tue, 30 Mar 2010 20:34:39 +0000
(13:34 -0700)
Merge commit '
8899186b60bcbfa783217a0f773e4cd032911f3c
' into froyo-plus-aosp
* commit '
8899186b60bcbfa783217a0f773e4cd032911f3c
':
Timeout on socket recv calls after 5secs, retry connection also if server unexpectedly closed the connection on its end and we know that there should've been more data available.
Trivial merge
OSDN Git Service
