tree 1fc68c9cff24f6644c04cc7dadb6800d3b8fd841
parent 5a66955fd976911b0a813bd1de46012159ce7b46
parent 9b774827b4533cdda7ea04431f405efcb910bde9
author Michael Mikhail <michaelmikhil@google.com> 1685135502 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1685135502 +0000

[automerger skipped] Merge "Verify URI permissions in MediaMetadata" into sc-dev am: 2a93c53d21 am: 18a0a0920f am: db86e3e4cd -s ours am: 9a0b3244a2 -s ours am: 9b774827b4 -s ours

am skip reason: Merged-In I384f8e230c909d8fc8e5f147e2fd3558fec44626 with SHA-1 01f65561df is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23207574

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