tree bab5d22478d8123cad6849e7ab59fad798444e64
parent cfaf0132956a16e61fe15dc9a32c08720122655a
parent eee8b8f052cd5235289f785a64a5dc1415007ef0
author Yao Chen <yaochen@google.com> 1696024103 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1696024103 +0000

[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 skip reason: Merged-In Ibe03a17dee91ac5bf25d123d4fd9c0bdd3c7d80e with SHA-1 db60b2f5e0 is already in history

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

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