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:
b46c807
d9f1241
)
am 1aa25597: am 87ed10d7: Merge change I577dd1f3 into eclair
author
Jaikumar Ganesh
<jaikumar@google.com>
Mon, 21 Dec 2009 22:22:37 +0000
(14:22 -0800)
committer
Android Git Automerger
<android-git-automerger@android.com>
Mon, 21 Dec 2009 22:22:37 +0000
(14:22 -0800)
Merge commit '
1aa2559797d49fa0c6cf7885c9fed5797e42231f
'
* commit '
1aa2559797d49fa0c6cf7885c9fed5797e42231f
':
Accept incoming connections if no other sink is in NonDisconnecting state.
Trivial merge