OSDN Git Service

(root) / android-x86 / frameworks-av.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a36d8ca 8ae0f55)
am 9a87a838: (-s ours) am 5d42075e: Merge "DO NOT MERGE: Instead of asserting, remove...
authorAndreas Huber <andih@google.com>
Fri, 11 Nov 2011 19:51:11 +0000 (11:51 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 11 Nov 2011 19:51:11 +0000 (11:51 -0800)
* commit '9a87a838028f3911a066a729cdb5ec688903a5ae':
  DO NOT MERGE: Instead of asserting, remove active streams if their sockets


Trivial merge
frameworks/av
About OSDN
Find Software
Develop Software
Help