OSDN Git Service
(root)
/
android-x86
/
frameworks-base.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
9c981cd
5d42075
)
am 5d42075e: Merge "DO NOT MERGE: Instead of asserting, remove active streams if...
author
Andreas Huber
<andih@google.com>
Fri, 11 Nov 2011 19:47:58 +0000
(11:47 -0800)
committer
Android Git Automerger
<android-git-automerger@android.com>
Fri, 11 Nov 2011 19:47:58 +0000
(11:47 -0800)
* commit '
5d42075e450a49af2bb37ca3a9610921df7607f2
':
DO NOT MERGE: Instead of asserting, remove active streams if their sockets
Trivial merge