tree 15e41414e98402a452a214fc504b7c477d4334b6
parent 9768f8643692d94c9f6283ae06a2f11c70489b9d
parent f61a8f29cadba157bae89fa348231402d91ec356
author Steven Kester Yuwono <yuwono@google.com> 1701098822 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1701098822 +0000

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>