OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b46c807 d9f1241)
am 1aa25597: am 87ed10d7: Merge change I577dd1f3 into eclair
authorJaikumar Ganesh <jaikumar@google.com>
Mon, 21 Dec 2009 22:22:37 +0000 (14:22 -0800)
committerAndroid 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
frameworks/native
About OSDN
Find Software
Develop Software
Help