| commit | ec43e46d8acade342b86edda752d4d76780bc36f | [log] [tgz] |
|---|---|---|
| author | Nikolay Elenkov <nikolayelenkov@google.com> | Wed Jul 10 04:58:19 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Jul 10 04:58:19 2024 +0000 |
| tree | edd65ecee1096c11a327f8d6b50a53de65e8c8fe | |
| parent | 47030ba15fd2539f00794c458c3299e857c7d9c1 [diff] | |
| parent | ac88e86f72a779359b30af9be34f619b78bd0566 [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: ac88e86f72 -s ours am skip reason: contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/28160602 Change-Id: I7ac28c1574da90eb9ab7a5847ced00d7b8329163 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>