tree cf5ad4bb7114fc4e9a82d70dff3f9192a792aa40
parent 981e2def1778bc72322b5dbb2e91fe3b5ad08dba
parent efee5581b7216bb00847390241e8d1216ee356d0
author Andreas Huber <andih@google.com> 1289844437 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 1289844437 -0800

Merge "Add http live mime types to MediaFile, add support for playlist mime types to browser."