OSDN Git Service

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)
commit4f1ef2cd65d734edae17f8586cf717598b40f2c3
treeef7587a0fa6221794a277b87812ea23d54c85406
parentff382d0c40493303ceb81a6c22d1a48c0fecfe9c
parent1000d426bedb1ec38bdfff98fc8f004b64af13cb
am 1000d426: am f780d28d: Merge "DO NOT MERGE: Revert "mediaplayer: keep more buffers with the BufferQueue"" into klp-dev

* commit '1000d426bedb1ec38bdfff98fc8f004b64af13cb':
  DO NOT MERGE: Revert "mediaplayer: keep more buffers with the BufferQueue"
media/libstagefright/ACodec.cpp