am 5262df1f: am 64d7b68f: Merge "Don\'t hard code the number of buffers for...
am 5262df1f: am 64d7b68f: Merge "Don\'t hard code the number of buffers for SurfaceMediaSource" into jb-mr1-dev
* commit '5262df1f':
Don't hard code the number of buffers for SurfaceMediaSource