tree 29564f1f349c524cdeaa616ec366901f2a87263f
parent 896846679fbad70e80c44bac579d2518922631e0
parent ec83448b10b11b1a31ec775c623c4cc1a8c1c150
author Nikolay Elenkov <nikolayelenkov@google.com> 1720512841 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1720512841 +0000

[automerger skipped] RESTRICT AUTOMERGE Delete keystore keys from RecoveryService.rebootRecoveryWithCommand() am: 9cdf9eae2e am: 7c3df3c24e -s ours am: a7031223ef -s ours am: b0082a867d -s ours am: 1b9e102f7e -s ours am: adb8b1d633 -s ours am: ec83448b10 -s ours

am skip reason: contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/28006045

Change-Id: I7f44c7d820509837b945a2273be7193a87586c64
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>