commit | 3649b12deaec895757bd85be5a052e577ed24f26 | [log] [tgz] |
---|---|---|
author | Nikolay Elenkov <nikolayelenkov@google.com> | Wed Jul 10 04:38:49 2024 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Jul 10 04:38:49 2024 +0000 |
tree | 5522ed6f45df554a50efee1c7c6f6ba450fc1d6f | |
parent | 1b9e102f7e10aa716e293f81761d9a4ec37adba4 [diff] | |
parent | ab699f95538bd5717930872c90e6f1284b001a3e [diff] |
[automerger skipped] RESTRICT AUTOMERGE Delete keystore keys from RecoveryService.rebootRecoveryWithCommand() am: 1e81807b18 -s ours am: ab699f9553 -s ours am skip reason: contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/28160602 Change-Id: Icf683f7fc955aa6fb5a6e481577c81d1eb15f2e5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>