OSDN Git Service

(root) / android-x86 / frameworks-av.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d273775 bdb54da)
Merge remote-tracking branch 'cm/cm-13.0' into cm-13.0-x86
authorJaap Jan Meijer <jjmeijer88@gmail.com>
Fri, 2 Sep 2016 13:12:30 +0000 (15:12 +0200)
committerJaap Jan Meijer <jjmeijer88@gmail.com>
Fri, 2 Sep 2016 13:12:30 +0000 (15:12 +0200)
1  2 
media/libstagefright/CameraSource.cpp patch | diff1 | diff2 | blob | history

diff --cc media/libstagefright/CameraSource.cpp
Simple merge
frameworks/av
About OSDN
Find Software
Develop Software
Help