| commit | 9f9f992ff4ae023f2c200a8ada6d9c6a78973567 | [log] [tgz] |
|---|---|---|
| author | Nikolay Elenkov <nikolayelenkov@google.com> | Tue Jul 09 06:16:22 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Jul 09 06:16:22 2024 +0000 |
| tree | bbd3276a8a8a1b176ea73613bf3a244e7784dc81 | |
| parent | 44e2348a58fbe3354101ab12504662e16b9bfc29 [diff] | |
| parent | 5ee4ffd56b0d535e01bcaadfd3e312d14972b541 [diff] |
[automerger skipped] Merge "RESTRICT AUTOMERGE Delete keystore keys from RecoveryService.rebootRecoveryWithCommand()" into tm-dev am: 205ffa2a8c am: 690d232e95 am: 4583dd90ee -s ours am: 05fcd6da31 -s ours am: 5ee4ffd56b -s ours am skip reason: contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/28062211 Change-Id: I2c26ff9b268a4526ef7cce8b86150f6743f668e1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>