tree 2b81556229c63dc55b59f1e551773fb34cb2d002
parent 6dea29313090b2e4825046eab0d92f617371e816
parent a7d64bf5a054a62bb9cc238c4aa4c783362cca85
author Yao Chen <yaochen@google.com> 1696053761 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1696053761 +0000

[automerger skipped] Merge "Use readUniqueFileDescriptor in incidentd service" into rvc-dev am: 61621c9510 -s ours am: b97477cde4 -s ours am: b4e7f02f13 -s ours am: a525c08da5 -s ours am: 372e2a4886 -s ours am: 3cc2961046 -s ours am: 1e4d3c7144 -s ours am: c11f2cce35 -s ours am: 5aeeadf3ec -s ours am: a7d64bf5a0 -s ours

am skip reason: Merged-In Ibe03a17dee91ac5bf25d123d4fd9c0bdd3c7d80e with SHA-1 6fe53e86ed is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24607942

Change-Id: I19100bf0bbfa42ef26140b9a71c740d6bb88ba53
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>