am 019188fd: Merge change Ifb8562d3 into eclair-mr2

Merge commit '019188fd686dbe7a9610255ea8aa61bd589a6bd1' into eclair-mr2-plus-aosp

* commit '019188fd686dbe7a9610255ea8aa61bd589a6bd1':
  Add a few specific file type support