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