commit 0d5966b558597ce502330936ec7e96b4044ce6eb
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Oct 05 02:04:53 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Oct 05 02:04:53 2023 +0000
tree 2815c4679448cc191e835377566e33c1b1f25cfb
parent 779ebfc2c23819a7654e423a1ac647d0da6840d6
parent 5a639f203ffc9c870c03309d04940304f7af143e

Merge changes from topic "am-144bc4c012e9421c9e52671f3eb3ec58" into udc-qpr-dev-plus-aosp

* changes:
  [automerger skipped] Merge "[RESTRICT AUTOMERGE] Update uid state based on capability field" into rvc-dev am: 051ea37d0f am: f146fc80b9 -s ours am: 4592c32fe2 -s ours am: 3b2f0dc2b1 -s ours am: 02cbe9bb65 -s ours am: 9c55334f52 -s ours am: 1b6ca6fe56 -s ours am: 160490e02e -s ours am: ac8a96ec8a -s ours am: 47dd45ab23 -s ours
  [automerger skipped] [RESTRICT AUTOMERGE] Update uid state based on capability field am: 7aa76cedc0 am: 6ef06c8f03 -s ours am: 3fcdd72822 -s ours am: bf9eafb33d -s ours am: 22f039c555 -s ours am: 7c5bedd6c0 -s ours am: 6760b8f7f0 -s ours am: d2b876dba7 -s ours am: 0b3b289422 -s ours am: ccbc88c189 -s ours