am 5db05850: am 1a0d1670: Merge "Optionally have SurfaceMediaSource return...
am 5db05850: am 1a0d1670: Merge "Optionally have SurfaceMediaSource return absolute timestamps" into jb-mr1-dev
* commit '5db05850':
Optionally have SurfaceMediaSource return absolute timestamps