| commit | 66136d19a13df1fded610ef2de34b7d0a1b9ab86 | [log] [tgz] |
|---|---|---|
| author | Marzia Favaro <marziana@google.com> | Mon Sep 18 22:18:56 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Sep 18 22:18:56 2023 +0000 |
| tree | 74a42c83567bf91f47c8ab123b7c177047de36bc | |
| parent | 38498a69d0fa819b641c03005ea639875dc50661 [diff] | |
| parent | 97280e209a63926ddff4a3be9b3f099949ea8c77 [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 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: I48d1d6bde34afd50e657e1fce613f2a619112ce1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>