| commit | 9509ee9481eb8c17da6786fe9f1c9bc4d932620f | [log] [tgz] |
|---|---|---|
| author | Nikolay Elenkov <nikolayelenkov@google.com> | Wed Jul 10 05:15:51 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Jul 10 05:15:51 2024 +0000 |
| tree | 193c3011be987af7bcb86159c931cfc428efae8f | |
| parent | a753732d21767d95c1f244e4b6f4f9a96d276097 [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: I322d793251b6a43039ced86f7a6bab22cf410aea Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>