| commit | 0ce7b721fcc4150a4f37f51aa9632ad363ba4d81 | [log] [tgz] |
|---|---|---|
| author | Nikolay Elenkov <nikolayelenkov@google.com> | Wed Jul 10 05:22:38 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Jul 10 05:22:38 2024 +0000 |
| tree | 193c3011be987af7bcb86159c931cfc428efae8f | |
| parent | c2baba8fa9952aeae259c29bf7cea481e03b457a [diff] | |
| parent | aec806e20d848265822cac203d8616356bbe9a90 [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 skip reason: contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/28160602 Change-Id: Icc0c971a50d5e3ae92aa836814fd1ed6337c20c6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>