| commit | 004336f46e84976d73427dab24538bef3c7c0d30 | [log] [tgz] |
|---|---|---|
| author | Nikolay Elenkov <nikolayelenkov@google.com> | Tue Jul 09 05:54:42 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Jul 09 05:54:42 2024 +0000 |
| tree | 193c3011be987af7bcb86159c931cfc428efae8f | |
| parent | 414420654841d3ce8290dd69c59c1247c8f6a3f1 [diff] | |
| parent | 0b5a7a405ec10b41796fc0e45e00c272f1aa7ada [diff] |
[automerger skipped] Merge "RESTRICT AUTOMERGE Delete keystore keys from RecoveryService.rebootRecoveryWithCommand()" into tm-dev am: 205ffa2a8c am: fee0952de3 -s ours am: 0b5a7a405e -s ours am skip reason: contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/28062211 Change-Id: Ia2a58f508163999cc600f0a4e2518f9474c5d0b6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>