Merge commit '3fd2a81ec174f226c0b889e2679dd54e3c086d1c' into eclair-plus-aosp * commit '3fd2a81ec174f226c0b889e2679dd54e3c086d1c': Add extension->mime type mappings
Merge commit '3fd2a81ec174f226c0b889e2679dd54e3c086d1c' into eclair-plus-aosp * commit '3fd2a81ec174f226c0b889e2679dd54e3c086d1c': Add extension->mime type mappings