commit 9165616f845fc02b7e10b984b86ea5b77e9e83ad
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Sat Sep 30 00:07:06 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sat Sep 30 00:07:06 2023 +0000
tree 8d38f9be795cbfb76f92027df3c26da30db62bf5
parent dd0bdab4b23ba567f62262ed0f1d93527101ce39
parent e56a310f1f0423ce80d320f339527b108e413e62

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

* changes:
  [automerger skipped] Merge "Use readUniqueFileDescriptor in incidentd service" into sc-qpr1-dev am: 34f6ef3664 -s ours am: 4a3587d70c -s ours am: 2230add689 -s ours am: eee8b8f052 -s ours am: 8ea60ca336 -s ours am: e7861a65a3 -s ours am: abb6a54f96 -s ours
  [automerger skipped] Use readUniqueFileDescriptor in incidentd service am: d28f10d80a -s ours am: 1710efa382 -s ours am: 053190aa45 -s ours am: 8c14fab944 -s ours am: cfaf013295 -s ours am: 1d489b527e -s ours am: e82ab3bde9 -s ours