tree 45b5bbf844abd2e0a140a64e7a5b8065fc34b7be
parent c4547819df56011bea466ed47645354c75c21240
parent 94f9f69e22912da67c4df547125c4406ddc936f1
author Tobias Thierer <tobiast@google.com> 1558616916 -0700
committer android-build-merger <android-build-merger@google.com> 1558616916 -0700

Merge "android.mime.types: Allow one-way mime -> ext only override." am: 9b08d3b3ba
am: 94f9f69e22

Change-Id: I75cf91cc8492bdc9af71747f1b7dd36976d30187