tree 905141c23b43ad7159fa8ec9302c80dd57592d76
parent 8c14fab944c909e4d1b9f259259e33bd8404fc19
parent 2230add689eeb722b7f739506eb395dfc7e6de69
author Yao Chen <yaochen@google.com> 1696023594 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1696023594 +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 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: Ied288c78478f7bbeaee15e528be11414e21aba9c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>