commit 40f315e09e8094130aa12e211fa26bd78eb4a024
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Aug 18 02:12:35 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Aug 18 02:12:35 2023 +0000
tree bfc645d2d2e527dcb237da19408ab4044bc092a4
parent 4abcc2fde137be20a7434f48a6794db4971f8bd4
parent 97164a6f73d10d08ac85338d571dd2f30377abfc

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

* changes:
  [automerger skipped] Merge "RESTRICT AUTOMERGE Make log reader thread a class member" into rvc-dev am: 7aec1d83d1 am: 4a0dc5a15c -s ours am: 508bbf100f -s ours am: 547b64e1cc -s ours am: 67401687fc -s ours am: 367219bb7c -s ours am: d33640d502 -s ours am: 89e27b189c -s ours am: f527936317 -s ours
  [automerger skipped] RESTRICT AUTOMERGE Make log reader thread a class member am: 03de4e4f1a am: 3cc4501681 -s ours am: 9bee032a19 -s ours am: e7bd1c641c -s ours am: ed8fc43b81 -s ours am: 10961a4a71 -s ours am: 67fc90bf5f -s ours am: ca3813ab97 -s ours am: 097a4b8301 -s ours