| commit | 5e73bd81930a5de71254691ed2d460fee638dd3f | [log] [tgz] |
|---|---|---|
| author | Marzia Favaro <marziana@google.com> | Mon Sep 18 18:02:25 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Sep 18 18:02:25 2023 +0000 |
| tree | d28dda9c5276546308f83a83614149130b71c076 | |
| parent | 57e16d7fa70f10ebc17c3e71f4901ea1d8aa3bfb [diff] | |
| parent | 0327955073fcea7115c33932c5144e8da18e3193 [diff] |
[automerger skipped] Merge "Require permission to unlock keyguard" into sc-v2-dev am: 0327955073 -s ours am skip reason: Merged-In I7ba7e56f954c8e6f1f734311f735215918975bc6 with SHA-1 41bc7c0042 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24342147 Change-Id: Ib93578f492e26bb2f2c91721ac5af9d514f9e6a4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>