OSDN Git Service

(root) / android-x86 / frameworks-av.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ff382d0 1000d42)
am 1000d426: am f780d28d: Merge "DO NOT MERGE: Revert "mediaplayer: keep more buffers...
authorLajos Molnar <lajos@google.com>
Fri, 28 Mar 2014 01:50:50 +0000 (01:50 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 28 Mar 2014 01:50:50 +0000 (01:50 +0000)
* commit '1000d426bedb1ec38bdfff98fc8f004b64af13cb':
  DO NOT MERGE: Revert "mediaplayer: keep more buffers with the BufferQueue"

1  2 
media/libstagefright/ACodec.cpp patch | diff1 | diff2 | blob | history

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