tree 5b7865d0a0b10630bb84138bd6fabf30e1e4dda9
parent 83ae59bf89de5787691fd92a995f2ca22d3cb634
parent ba882922f35109680653af2be70777219d50d92c
author Yao Chen <yaochen@google.com> 1696058481 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1696058481 +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: ba882922f3 -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: Ie58b2ef9eae836e9792c423acf012dfa849e19cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>