tree 1dd2ced83851a1da529da39caf7aa02811637f9f
parent bdc0f9a3c8bf4edc37b2cfe1efe2ec13b73ebf65
parent 9e733379a14bcbbfc25eb411710f154820098d81
author Marzia Favaro <marziana@google.com> 1694820865 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1694820865 +0000

[automerger skipped] Require permission to unlock keyguard am: ad8e7e3b1d -s ours am: 5173b7987e -s ours am: ea9e51e3cd -s ours am: 620b89a869 -s ours am: 7c2f597c46 -s ours am: 511dee9523 -s ours am: d9fe035e60 -s ours am: d51ad40ab0 -s ours am: c99d9b6214 -s ours am: 9e733379a1 -s ours

am skip reason: Merged-In I7ba7e56f954c8e6f1f734311f735215918975bc6 with SHA-1 9ef8ef1dc5 is already in history

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

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