tree 7762984677d2b29965cfbdacf584ca8fa9b7c941
parent c3dcf1007aa964f825b2ea2ef86acb7f332e748f
parent 8bf96c011ff4128f9bf06b892a38d869192d6a25
author Lajos Molnar <lajos@google.com> 1395971450 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1395971450 +0000

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

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