Merge commit '208360b22db7bdd940a7005fd44135e8916742af' into eclair-mr2-plus-aosp * commit '208360b22db7bdd940a7005fd44135e8916742af': Fix for b/2164520: Download manager should handle video/m4v MIME type.
Merge commit '208360b22db7bdd940a7005fd44135e8916742af' into eclair-mr2-plus-aosp * commit '208360b22db7bdd940a7005fd44135e8916742af': Fix for b/2164520: Download manager should handle video/m4v MIME type.