OSDN Git Service

(root) / android-x86 / frameworks-av.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 73bb0b9 18f9bb1)
am 8a065423: am 23217182: Merge "Didn\'t mean to check this in..." into ics-mr1
authorAndreas Huber <andih@google.com>
Fri, 11 Nov 2011 19:51:17 +0000 (11:51 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 11 Nov 2011 19:51:17 +0000 (11:51 -0800)
* commit '8a0654231ff36d938bc3451190cf67231195f1d0':
  Didn't mean to check this in...

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