commit 40e37e68b6b3bd0d29bfd27aaeff1f2f096d8fe9
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Oct 10 06:47:27 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Oct 10 06:47:27 2023 +0000
tree a6bcaff6d4249c5fbcf70dc8f5c120d101466467
parent bc057f147559f971d3d54490b2a6ff072f578c91
parent de20ac6dbdeabbdd6a6e0486581ff600d4ddb09e

Merge changes from topic "am-c5ec16bd9ddd4a4b98e3002bb6f376e2" into udc-d1-dev-plus-aosp

* changes:
  [automerger skipped] Merge "RESTRICT AUTOMERGE: Check URI permissions for resumable media artwork" into sc-dev am: 055c43b61b -s ours am: cdbede6443 -s ours am: ff6c98c175 -s ours am: ac22d32daa -s ours am: e2a0b727c8 -s ours am: f4feb1e9f8 -s ours am: 373c2479c5 -s ours am: 531fe34981 -s ours
  [automerger skipped] RESTRICT AUTOMERGE: Check URI permissions for resumable media artwork am: ffae193f19 -s ours am: 49281f21a5 -s ours am: 41bdc6c293 -s ours am: 2c2f9d6e32 -s ours am: 77ff4dce03 -s ours am: c67aa2eac1 -s ours am: c7e6061a64 -s ours am: ca8ef50b9e -s ours