| commit | e6c4fa6ef4bfa7020ad84247ff3a706a26590284 | [log] [tgz] |
|---|---|---|
| author | Nikolay Elenkov <nikolayelenkov@google.com> | Wed Jul 10 05:46:09 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Jul 10 05:46:09 2024 +0000 |
| tree | bbd3276a8a8a1b176ea73613bf3a244e7784dc81 | |
| parent | 8bfc20ba7a017cf0a26733ddd12a04341c9a5f90 [diff] | |
| parent | 9509ee9481eb8c17da6786fe9f1c9bc4d932620f [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: e90c799101 -s ours am: 28093109cc -s ours am: 9509ee9481 -s ours am skip reason: contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/28160602 Change-Id: Iabc09087b50c7113232085bcc4d68b71c2107e68 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>