OSDN Git Service

(root) / android-x86 / frameworks-av.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 54500e5 2e56cfc)
am 40461ee7: am cd556b82: Merge "Instead of asserting, signal a runtime error if...
authorAndreas Huber <andih@google.com>
Fri, 11 Nov 2011 19:51:12 +0000 (11:51 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 11 Nov 2011 19:51:12 +0000 (11:51 -0800)
* commit '40461ee70161d8568663332f72be2353b04c34e7':
  Instead of asserting, signal a runtime error if the session doesn't contain

1  2 
media/libstagefright/rtsp/MyHandler.h patch | diff1 | diff2 | blob | history

diff --cc media/libstagefright/rtsp/MyHandler.h
Simple merge
frameworks/av
About OSDN
Find Software
Develop Software
Help