| commit | 2e568544ae240fc4637bc273e2b3983f709e2cc0 | [log] [tgz] |
|---|---|---|
| author | Nikolay Elenkov <nikolayelenkov@google.com> | Tue Jul 09 05:54:59 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Jul 09 05:54:59 2024 +0000 |
| tree | b9410fa0d0ee235cdb2a2d5323fbf70a21c21e46 | |
| parent | 3f2f8bd40601e729a0106bcd67f237fa1e225961 [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: I97196d37106683a4bcd215b6a304f1d72897d1c1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>