tree 8b69a34d2e3ad17d22eadfad281065cda707ed21
parent b64776fcde848bcab26e3c64b76a4dda2ce33f34
parent 4f1ef2cd65d734edae17f8586cf717598b40f2c3
author Lajos Molnar <lajos@google.com> 1395984247 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1395984247 +0000

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"