commit | 4c2c8e136cbfdad4d0b9e0a96523b8bcfe4cfea0 | [log] [tgz] |
---|---|---|
author | Yao Chen <yaochen@google.com> | Sat Sep 30 07:19:33 2023 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Sep 30 07:19:33 2023 +0000 |
tree | 5b7865d0a0b10630bb84138bd6fabf30e1e4dda9 | |
parent | 99d0d4edf7712cb63b6db60e4167d76f01a6fd6f [diff] | |
parent | fdec043c74722c00ad445acf5305069aed065b3c [diff] |
[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: 1e4d3c7144 -s ours am: c11f2cce35 -s ours am: d9b29af5f0 -s ours am: 27d6b3a5b0 -s ours am: fdec043c74 -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: I08a547c767888988de12b2a8858b2cb473624035 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>