tree cdbda10bb57fdbfbdf34cf84e1af485dd3dc993b
parent 9b4725d0716c8bd14e087e34bd32b981111ce553
parent 9459f93c97bd4d43be11d1776ea04a0d6927cdea
author Daniel Nishi <dhnishi@google.com> 1467835365 +0000
committer android-build-merger <android-build-merger@google.com> 1467835365 +0000

Merge \"Move the MIME type icon detection into the platform.\" into nyc-mr1-dev
am: 9459f93c97

Change-Id: I151a72b8ee1c16ef94da70e85378dd44b4ac077c