OSDN Git Service

am 4f1ef2cd: (-s ours) am 1000d426: am f780d28d: Merge "DO NOT MERGE: Revert "mediapl...
authorLajos Molnar <lajos@google.com>
Fri, 28 Mar 2014 05:24:07 +0000 (05:24 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 28 Mar 2014 05:24:07 +0000 (05:24 +0000)
commitafe1ba72551d6bd6e3bee9b77fe7538201ab6193
tree8b69a34d2e3ad17d22eadfad281065cda707ed21
parentb64776fcde848bcab26e3c64b76a4dda2ce33f34
parent4f1ef2cd65d734edae17f8586cf717598b40f2c3
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"