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

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

* changes:
  [automerger skipped] Merge "Use readUniqueFileDescriptor in incidentd service" into rvc-qpr-dev am: cf1a6b6131 -s ours am: b4c962e9c2 -s ours am: ff77cd4970 -s ours am: 5b33166e7e -s ours am: d03ed52184 -s ours am: eacebc1096 -s ours am: e165313a1c -s ours am: 3974acaec3 -s ours am: f4cfdfa22a -s ours
  [automerger skipped] Use readUniqueFileDescriptor in incidentd service am: 6fe53e86ed -s ours am: 20e9d07192 -s ours am: 3606e96b58 -s ours am: c84972c63c -s ours am: 258d631438 -s ours am: b815f54054 -s ours am: 9954e6b0f2 -s ours am: 827c25ca4b -s ours am: d675a2aaf4 -s ours