| commit | d4f41ce8f07e284666ce570ef8a6954dc5c7de9e | [log] [tgz] |
|---|---|---|
| author | Marzia Favaro <marziana@google.com> | Mon Sep 18 23:18:23 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Sep 18 23:18:23 2023 +0000 |
| tree | 5ede10fd11f9e3d5f07c6ece27d2333fa19a0197 | |
| parent | 598993bbf6c00269a5a9766949090c5704384080 [diff] | |
| parent | 66136d19a13df1fded610ef2de34b7d0a1b9ab86 [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: 97280e209a -s ours am: 66136d19a1 -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: I53dd3108605a9cedcb01058e0716b2b12244f15f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>