tree 732650b099bcd805ca82c7070a606b393e79b8d4
parent 443dc0d797293bba223a9ae6ee831990c463da46
parent 98fdb1d810dda80de9975148a950719abbeb3a97
author Tobias Thierer <tobiast@google.com> 1570053722 -0700
committer android-build-merger <android-build-merger@google.com> 1570053722 -0700

Merge "Make CTS more opinionated about the platform's default MimeMap." am: a8bfed9104 am: ac8a5625d2 am: 7e2ac2ea09
am: 98fdb1d810

Change-Id: I5eb0bd3cf5fd50d180c8da61a375f3faa0737164