| commit | f72e484da4888a0094729d4bdb508124b92eca5f | [log] [tgz] |
|---|---|---|
| author | Marzia Favaro <marziana@google.com> | Fri Sep 15 17:21:12 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 15 17:21:12 2023 +0000 |
| tree | 36997cb3135098552666868813ec81aee69ed432 | |
| parent | 620b89a869bd91dfbd8b2a14f874e472e87e6eed [diff] | |
| parent | 8ba2179244f23e07631c34ae5033bb00e402e858 [diff] |
[automerger skipped] Merge "Require permission to unlock keyguard" into rvc-dev am: 78b272400f -s ours am: 30316315ae -s ours am: 8ba2179244 -s ours am skip reason: Merged-In I7ba7e56f954c8e6f1f734311f735215918975bc6 with SHA-1 9ef8ef1dc5 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24341231 Change-Id: Idec5837b3ee3b5570e5c08594d04779be3878b43 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>