diff options
| author | 2023-11-27 16:15:53 +0000 | |
|---|---|---|
| committer | 2023-11-27 16:15:53 +0000 | |
| commit | bc5620a86c1f26171bef514a433d46339c39178c (patch) | |
| tree | aa46fe50f72bbc0d231b51d562571db041ba83e0 | |
| parent | 5f317749db15e16483e5433c5b698307519af8f7 (diff) | |
| parent | cf2dfc00cc18d2e60964fe1639dc74cc17574154 (diff) | |
Merge "Add Apple Wallet's pkpass mime type" into main am: 56479560cf am: f61a8f29ca am: cf2dfc00cc
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2812033
Change-Id: I7ad46c1aed2d27bf19e0eefcaa26f812f32e878a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | mime/java-res/android.mime.types | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mime/java-res/android.mime.types b/mime/java-res/android.mime.types index fd785a45a8ba..b7955603a97a 100644 --- a/mime/java-res/android.mime.types +++ b/mime/java-res/android.mime.types @@ -55,6 +55,8 @@ ?application/vnd.android.haptics.vibration+xml ahv ?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 |