tree cdb40e5d49dd70671c146ed0e8ff27080c1fd26a
parent f5e4c392ec21ee47900ae5a2d3b0391ecfee6f1e
parent ece56fc6cefd8102a0718375e03831d52a24c4f6
author Tobias Thierer <tobiast@google.com> 1570194451 -0700
committer android-build-merger <android-build-merger@google.com> 1570194451 -0700

Merge changes from topic "bug124232146_move_MimeMap"
am: ece56fc6ce

Change-Id: I7bafaaaf11776689fa1846e15340bd63614eefbc