diff options
| author | 2023-11-27 15:20:37 +0000 | |
|---|---|---|
| committer | 2023-11-27 15:20:37 +0000 | |
| commit | f61a8f29cadba157bae89fa348231402d91ec356 (patch) | |
| tree | dbc3f5e3dfc30c46641c138447bfa1105cc39919 | |
| parent | 6b5d8e0be5e16b9c12fe6d0b4a52acbf17c7eb46 (diff) | |
| parent | 56479560cf38dc1786e2f82c849afe86b1bc7b11 (diff) | |
Merge "Add Apple Wallet's pkpass mime type" into main am: 56479560cf
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2812033
Change-Id: I68e883d8c0eff486093743950dad95ec9c8aa094
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 cb74cfc89cbe..fbdfe3e35b87 100644 --- a/mime/java-res/android.mime.types +++ b/mime/java-res/android.mime.types @@ -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 |