| commit | cf2dfc00cc18d2e60964fe1639dc74cc17574154 | [log] [tgz] |
|---|---|---|
| author | Steven Kester Yuwono <yuwono@google.com> | Mon Nov 27 15:27:02 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Nov 27 15:27:02 2023 +0000 |
| tree | 15e41414e98402a452a214fc504b7c477d4334b6 | |
| parent | 9768f8643692d94c9f6283ae06a2f11c70489b9d [diff] | |
| parent | f61a8f29cadba157bae89fa348231402d91ec356 [diff] |
Merge "Add Apple Wallet's pkpass mime type" into main am: 56479560cf am: f61a8f29ca Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2812033 Change-Id: Ibfbb02aeb67782ea44101fdadc90eed539983808 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/mime/java-res/android.mime.types b/mime/java-res/android.mime.types index cb74cfc..fbdfe3e 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