tree 2eb2a868b54f09438e0f46f608077151a7624500
parent b637332e1d38293b897b37f3abfb757877d1ca7e
parent e7861a65a3da0004b2a18f975dfa8ad04fffc8a3
author Yao Chen <yaochen@google.com> 1696027914 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1696027914 +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: 8ea60ca336 -s ours am: e7861a65a3 -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: I7366ceb70e86ac8fd6760bcf0630daecf548ffc5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>