am ec46fde1: am 106f1628: Merge "Allow for streaming of media files (without...
am ec46fde1: am 106f1628: Merge "Allow for streaming of media files (without recompression)" into jb-mr2-dev
* commit 'ec46fde1':
Allow for streaming of media files (without recompression)