| commit | afe1ba72551d6bd6e3bee9b77fe7538201ab6193 | [log] [tgz] |
|---|---|---|
| author | Lajos Molnar <lajos@google.com> | Fri Mar 28 05:24:07 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Mar 28 05:24:07 2014 +0000 |
| tree | 8b69a34d2e3ad17d22eadfad281065cda707ed21 | |
| parent | b64776fcde848bcab26e3c64b76a4dda2ce33f34 [diff] | |
| parent | 4f1ef2cd65d734edae17f8586cf717598b40f2c3 [diff] |
am 4f1ef2cd: (-s ours) am 1000d426: am f780d28d: Merge "DO NOT MERGE: Revert "mediaplayer: keep more buffers with the BufferQueue"" into klp-dev * commit '4f1ef2cd65d734edae17f8586cf717598b40f2c3': DO NOT MERGE: Revert "mediaplayer: keep more buffers with the BufferQueue"