tree d887257fd94b5f15f8287faf1263cef56dbaf270
parent c235df864edded100bc50c4352fd6672f16353b1
parent 16fb8f3954a6a4058953c505a4e7958a1b14c62b
author Andreas Huber <andih@google.com> 1363728579 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1363728579 +0000

Merge "Allow for streaming of media files (without recompression)" into jb-mr2-dev