Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cf2dfc00 authored by Steven Kester Yuwono's avatar Steven Kester Yuwono Committed by Automerger Merge Worker
Browse files

Merge "Add Apple Wallet's pkpass mime type" into main am: 56479560 am: f61a8f29 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2812033



Change-Id: Ibfbb02aeb67782ea44101fdadc90eed539983808
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9768f864 f61a8f29

mime/java-res/android.mime.types

+2 −0
Original line number Diff line number Diff line
@@ -54,6 +54,8 @@ 
?application/ttml+xml ttml dfxp

?application/vnd.android.ota ota

?application/vnd.apple.mpegurl m3u8

?application/vnd.apple.pkpass pkpass

?application/vnd.apple.pkpasses pkpasses

?application/vnd.ms-pki.stl stl

?application/vnd.ms-powerpoint pot

?application/vnd.ms-wpl wpl