Merge "Incr. MIN_UNDEQUEUED_BUFFERS in SurfaceMediaSource"

author Pannag Sanketi <psanketi@google.com>

Thu, 1 Sep 2011 05:00:35 +0000 (22:00 -0700)

committer Android (Google) Code Review <android-gerrit@google.com>

Thu, 1 Sep 2011 05:00:35 +0000 (22:00 -0700)
author Pannag Sanketi <psanketi@google.com>
Thu, 1 Sep 2011 05:00:35 +0000 (22:00 -0700)
committer Android (Google) Code Review <android-gerrit@google.com>
Thu, 1 Sep 2011 05:00:35 +0000 (22:00 -0700)
diff --cc include/media/stagefright/SurfaceMediaSource.h
Simple merge
author	Pannag Sanketi <psanketi@google.com>
	Thu, 1 Sep 2011 05:00:35 +0000 (22:00 -0700)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Thu, 1 Sep 2011 05:00:35 +0000 (22:00 -0700)