am 2316c56d: am 6c75ad21: Merge "Configure the SurfaceMediaSource to emit the...
am 2316c56d: am 6c75ad21: Merge "Configure the SurfaceMediaSource to emit the same number of buffers" into jb-mr1-dev
* commit '2316c56d':
Configure the SurfaceMediaSource to emit the same number of buffers