| commit | d4a12c959992b360605f0da42f0c4e4a59a46e1d | [log] [tgz] |
|---|---|---|
| author | Nikolay Elenkov <nikolayelenkov@google.com> | Wed Jul 10 05:46:45 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Jul 10 05:46:45 2024 +0000 |
| tree | bbd3276a8a8a1b176ea73613bf3a244e7784dc81 | |
| parent | 0b18dfd833ee9cb89bfa69457cf26650d83d3f44 [diff] | |
| parent | 0ce7b721fcc4150a4f37f51aa9632ad363ba4d81 [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: ec43e46d8a -s ours am: aec806e20d -s ours am: 0ce7b721fc -s ours am skip reason: contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/28160602 Change-Id: Ib22f982fe72b8695f98624c169dd7592123fa667 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>