tree 8b69a34d2e3ad17d22eadfad281065cda707ed21
parent 7595c47b4842d76dba0fcf26ef3ab98d215efe1e
parent ff382d0c40493303ceb81a6c22d1a48c0fecfe9c
author Lajos Molnar <lajos@google.com> 1395984242 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1395984242 +0000

am ff382d0c: (-s ours) am 8bf96c01: am 3d4e4fcb: Merge "DO NOT MERGE: Revert "stagefright: allow for minUndequeuedBufs to be one less"" into klp-dev

* commit 'ff382d0c40493303ceb81a6c22d1a48c0fecfe9c':
  DO NOT MERGE: Revert "stagefright: allow for minUndequeuedBufs to be one less"