commit c7170612248a588ac508fa9c6a58cfec99d78c73
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Oct 06 22:05:40 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Oct 06 22:05:40 2023 +0000
tree 5815e1cefd9c82d325d583d555ffe26c1d9a355b
parent 3d472ae9c198ec137db3efccc725e3f3b5f13135
parent 8d7b2ac0a5a64cf1acbb1eb5b07f3cd8c7278609

Merge changes from topic "am-8d92b7febf18429d970f0512c0be6f00" into main

* changes:
  [automerger skipped] Merge "RESTRICT AUTOMERGE: Check URI permissions for resumable media artwork" into sc-v2-dev am: 7806f3c6ec -s ours am: e4b9774b38 -s ours am: 20b0a7c3ee -s ours am: 1191771679 -s ours am: 42bd09244e -s ours am: c14bfd33f7 -s ours
  [automerger skipped] RESTRICT AUTOMERGE: Check URI permissions for resumable media artwork am: 1f758ee33f -s ours am: f9cc43261b -s ours am: 77c2bc79c1 -s ours am: 4e275308c8 -s ours am: 391e2c15fa -s ours am: 157ed0fef9 -s ours