tree e6ee21c6555ba11085667bcebffa1701055cf15b
parent 63adcc17d8d6e448637c2ddc0020af9c6b5dd99a
parent d8b5d6766d6f0415ec0772af1274d7d70c0ddcb8
author Yao Chen <yaochen@google.com> 1696046710 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1696046710 +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: a6ab3cf357 -s ours am: 63d7a87792 -s ours am: d8b5d6766d -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: I1d2879988602c193d756571bed540d2aba34722b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>