| commit | efe5dd92c632d00a87da0d2cec631f52080c348a | [log] [tgz] |
|---|---|---|
| author | Nikolay Elenkov <nikolayelenkov@google.com> | Tue Jul 09 06:42:03 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Jul 09 06:42:03 2024 +0000 |
| tree | 7e7804702be266bb999f3463a2da675ac5f30e1f | |
| parent | 6d0f29051a96eea4053f78eab50ece62e4e0d1f9 [diff] | |
| parent | 9f9f992ff4ae023f2c200a8ada6d9c6a78973567 [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: 9f9f992ff4 -s ours am skip reason: contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/28062211 Change-Id: I4372725665a258931edf4b80eb47cdcfc28efd89 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>