| commit | 2c24994e839e24d762336b1321650877541d16fd | [log] [tgz] |
|---|---|---|
| author | Marzia Favaro <marziana@google.com> | Mon Sep 18 19:46:00 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Sep 18 19:46:00 2023 +0000 |
| tree | 71e5b12a06e8eda0703b07a616806867c44c5241 | |
| parent | ebe216e84255f011bf0207359fe740a4e5b9a287 [diff] | |
| parent | 06febd6d52b34bf9d4dcb9376b72fdbb84d14085 [diff] |
[automerger skipped] Merge "Require permission to unlock keyguard" into sc-v2-dev am: 0327955073 -s ours am: 5e73bd8193 -s ours am: 4eef0a5a1c -s ours am: f51a32c287 -s ours am: 06febd6d52 -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: I502e996bc290738e47a5bc27125d9676a0d50e76 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>