commit | 07cccb70ce59e8829a53de40748c2b22a73e87cf | [log] [tgz] |
---|---|---|
author | Nikolay Elenkov <nikolayelenkov@google.com> | Wed Jul 10 05:15:57 2024 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Jul 10 05:15:57 2024 +0000 |
tree | 17396e29a1927b7877212f0db86dff36601dffb3 | |
parent | abe30374172a100bdf68f81f6771162a6118e237 [diff] | |
parent | 28093109cc238e2b239ac5d4cc7c75728a1cc7c6 [diff] |
[automerger skipped] Merge "RESTRICT AUTOMERGE Delete keystore keys from RecoveryService.rebootRecoveryWithCommand()" into sc-v2-dev am: eeba594f2c -s ours am: 2900f3f3f3 -s ours am: e90c799101 -s ours am: 28093109cc -s ours am skip reason: contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/28160602 Change-Id: I747235809c154f5b084980ddc340427d89bda886 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>