OSDN Git Service

(root) / android-x86 / frameworks-av.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 87f6855 4ab3045)
am 5d42075e: Merge "DO NOT MERGE: Instead of asserting, remove active streams if...
authorAndreas Huber <andih@google.com>
Fri, 11 Nov 2011 19:47:58 +0000 (11:47 -0800)
committerAndroid 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
frameworks/av
About OSDN
Find Software
Develop Software
Help