| commit | ca70fcde1fae64e2634f91ab702ecef640b946f0 | [log] [tgz] |
|---|---|---|
| author | Marzia Favaro <marziana@google.com> | Mon Sep 18 20:35:06 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Sep 18 20:35:06 2023 +0000 |
| tree | 22661ac57cd423cb3d5bb9356fa8b6b23d87f30f | |
| parent | 46cf236e559b2a15a34683491b71a68822f29cad [diff] | |
| parent | fab8f3c351c0dc8412074126e7325be58692f466 [diff] |
[automerger skipped] Merge "Require permission to unlock keyguard" into sc-qpr1-dev am: aac427df4c -s ours am: 8fbbc0c975 -s ours am: 3371c14a70 -s ours am: 1cb52a9c10 -s ours am: 183f01aab6 -s ours am: fab8f3c351 -s ours am skip reason: Merged-In I7ba7e56f954c8e6f1f734311f735215918975bc6 with SHA-1 6568e40be9 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24342144 Change-Id: Ideb543e95a810298b5ec067617f55d45f12c7162 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>