tree 382461254ce307cd80cc4d1e6d966e0ca5b7a910
parent b58e97604c8e278f2989173901d95b62587d32e8
parent c503125719c57b719b4f0e55f0c83f7db45cbeab
author Yao Chen <yaochen@google.com> 1696890030 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1696890030 +0000

[automerger skipped] Merge "Use readUniqueFileDescriptor in incidentd service" into tm-qpr-dev am: 1492058aa8 -s ours am: ced0112783 -s ours am: b744140fa9 -s ours am: 84be83e0a9 -s ours am: c503125719 -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/+/24608688

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