| commit | a120e97895e92cb8f40ba5aa955797d691faa0a0 | [log] [tgz] |
|---|---|---|
| author | Yao Chen <yaochen@google.com> | Sat Sep 30 07:23:03 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Sep 30 07:23:03 2023 +0000 |
| tree | 5b7865d0a0b10630bb84138bd6fabf30e1e4dda9 | |
| parent | e0f85d4141fef6030cea5f5b335e3ac0e7a5feeb [diff] | |
| parent | 5a222e8c75251c2e3f67eebadabb1959165c9af9 [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: a6ab3cf357 -s ours am: 63d7a87792 -s ours am: d8b5d6766d -s ours am: 0cac7e7c84 -s ours am: ab1c926da9 -s ours am: 5a222e8c75 -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: I0b2b5f3d9d5104fefa5d8cc0cc5372eb87a8889b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>