tree 1e625957471c7bf4d50a96a73ca3511ce4229273
parent e6fcebbf50d91e37cda0377999e22ea3284c9cd1
parent c29d2b04927b9d28089d79cbaa63a6a91db1bb5a
author Daniel Nishi <dhnishi@google.com> 1467834866 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1467834867 +0000

Merge "Move the MIME type icon detection into the platform." into nyc-mr1-dev