tree 79d39d74e26b740f96ab00c7537c8ede24715e1d
parent 740d70412e859b250d2fcb9b3e04f5cc81b38cb9
parent 77d2e08add3ba24fdc527809408028efe3e06b6b
author Pannag Sanketi <psanketi@google.com> 1314853366 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1314853366 -0700

am abf82f9e: Merge "Incr. MIN_UNDEQUEUED_BUFFERS in SurfaceMediaSource"

* commit 'abf82f9ea4960ead8716b183aac1792820cccdd1':
  Incr. MIN_UNDEQUEUED_BUFFERS in SurfaceMediaSource