tree 11d52f399f8a91dfe602acc3f3e2199f8df9b237
parent 15da7c17b569d8271ac2e97c12087f82d86993a1
parent 324349142cf3dacf5684bc3664b90ee81363dee1
author Treehugger Robot <treehugger-gerrit@google.com> 1569913336 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1569913336 +0000

Merge changes Iaf918ce3,I60032b97

* changes:
  Introduce vendor.mime.types
  android.mime.types: Fix typo.