| commit | e90c7991014672b2f71b5d031ec8064797ff1147 | [log] [tgz] |
|---|---|---|
| author | Nikolay Elenkov <nikolayelenkov@google.com> | Wed Jul 10 04:38:55 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Jul 10 04:38:55 2024 +0000 |
| tree | 5522ed6f45df554a50efee1c7c6f6ba450fc1d6f | |
| parent | 3649b12deaec895757bd85be5a052e577ed24f26 [diff] | |
| parent | 2900f3f3f38a4d1efc05bf9b85fae8f300e71c1a [diff] |
[automerger skipped] Merge "RESTRICT AUTOMERGE Delete keystore keys from RecoveryService.rebootRecoveryWithCommand()" into sc-v2-dev am: eeba594f2c -s ours am: 2900f3f3f3 -s ours am skip reason: contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/28160602 Change-Id: Ide7649141d8b99fe28fd514100950fe2650a58ce Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>