tree 29564f1f349c524cdeaa616ec366901f2a87263f
parent 0bf749e6b3a6fef5d9c7d574e93f10de8d3083c8
parent c48c9f249d06490b7324c2789e25bc13badaeb89
author Nikolay Elenkov <nikolayelenkov@google.com> 1720512884 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1720512884 +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: dbd202e9fc -s ours am: 22907f970f -s ours am: 64bbd524f9 -s ours am: c48c9f249d -s ours

am skip reason: contains skip directive

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

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