commit | 5ee4ffd56b0d535e01bcaadfd3e312d14972b541 | [log] [tgz] |
---|---|---|
author | Nikolay Elenkov <nikolayelenkov@google.com> | Tue Jul 09 06:03:02 2024 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Jul 09 06:03:02 2024 +0000 |
tree | 193c3011be987af7bcb86159c931cfc428efae8f | |
parent | be48aefbb1f3ed40a7a69612fd35a06f509958b9 [diff] | |
parent | 05fcd6da31aae30d9710b8e8423cf69ae68451b7 [diff] |
[automerger skipped] Merge "RESTRICT AUTOMERGE Delete keystore keys from RecoveryService.rebootRecoveryWithCommand()" into tm-dev am: 205ffa2a8c am: 690d232e95 am: 4583dd90ee -s ours am: 05fcd6da31 -s ours am skip reason: contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/28062211 Change-Id: I0d2a473dacce02e6881014214ee605448b8a391e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>