| commit | 5d1641919f5f1287c7c96383521a67c685d20144 | [log] [tgz] |
|---|---|---|
| author | Marzia Favaro <marziana@google.com> | Mon Sep 18 22:18:45 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Sep 18 22:18:45 2023 +0000 |
| tree | 261dc8c3231b76008dfe261612e0025f8bfed58e | |
| parent | f65916329d7be2cae6951f32b8cd982f554428cb [diff] | |
| parent | 683efb4402658d5f634214c962aabc7259f18e9d [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: 2c24994e83 -s ours am: 683efb4402 -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: Icc5df797a600db6362265c9ab92c5259a9681cc1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>