tree 3ddbd335c1f38a1dea9289d8ce381848c4a74c07
parent 3308718b4704a46bf20a4231c14b0e101b686a7e
parent c5adb95c8e20e45c9dbad8de318d45a945072421
author Xin Li <delphij@google.com> 1697759666 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1697759666 +0000

[automerger skipped] Merge 10952656 am: b314f106bb -s ours am: c5adb95c8e -s ours

am skip reason: Merged-In I75aa5bb3832d1bbb7a6df34ce809ff603215f1a2 with SHA-1 e9b23f9083 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/module_sdk/MediaProvider/+/25093245

Change-Id: Ib73c7785388cfaffc10afb8e78ac9e6d370375d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>