tree 626b09053812230d8eda1cf1f74c262c0f26f37f
parent ee3f4c0ee05b5414b6690968c23266351a71a72a
parent 6008c6155f311e038dc9b8715dcf476ea06cfd1c
author Beth Thibodeau <ethibodeau@google.com> 1696642012 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1696642012 +0000

[automerger skipped] Merge "RESTRICT AUTOMERGE: Check URI permissions for resumable media artwork" into rvc-dev am: e48d7291ca -s ours am: 2d941b0818 -s ours am: 99ae21062a -s ours am: b9ab54d757 -s ours am: 4dd7b2cfb9 -s ours am: 1cb821baf5 -s ours am: 6008c6155f -s ours

am skip reason: subject contains skip directive

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

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