| commit | ac88e86f72a779359b30af9be34f619b78bd0566 | [log] [tgz] |
|---|---|---|
| author | Nikolay Elenkov <nikolayelenkov@google.com> | Wed Jul 10 04:38:56 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Jul 10 04:38:56 2024 +0000 |
| tree | 5e49b1118d1d266f50b09b82a19d44985a6d67b6 | |
| parent | 8f0f2514306723dbef919e5a308105919aefb480 [diff] | |
| parent | 2900f3f3f38a4d1efc05bf9b85fae8f300e71c1a [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 skip reason: contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/28160602 Change-Id: I095705bf15b6bd41a7311fb1b476db81dfe56055 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>