tree e90781ad8807230e77995bd0b11c6f8474bba90d
parent 2acb7db524ff3a8414a9eb67a64b5c607bbbb4be
parent 1e4cc975ff0ee6f7dabc04e94cd9205076e79428
author Marzia Favaro <marziana@google.com> 1695066211 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1695066211 +0000

[automerger skipped] Merge "Require permission to unlock keyguard" into sc-dev am: b25ee8669f -s ours am: c1e069ef40 -s ours am: 75495d90ae -s ours am: bedfad328a -s ours am: ed66255cab -s ours am: 1e4cc975ff -s ours

am skip reason: Merged-In I7ba7e56f954c8e6f1f734311f735215918975bc6 with SHA-1 712ec1f4f8 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24339446

Change-Id: I050eb92a16c430a146e0e44928f461728e385ce2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>