commit | 3946267559f0a445eefda8e3823ba64848a9eef6 | [log] [tgz] |
---|---|---|
author | Marzia Favaro <marziana@google.com> | Wed Sep 20 09:28:47 2023 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Sep 20 09:28:47 2023 +0000 |
tree | e90781ad8807230e77995bd0b11c6f8474bba90d | |
parent | 77955b229e62f9df2acf681620ea753270349929 [diff] | |
parent | bc9059ae54a38bcc39887e29421863f7badd0dfc [diff] |
[automerger skipped] Merge "Require permission to unlock keyguard" into tm-qpr-dev am: bc9059ae54 -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/+/24342146 Change-Id: I89ee1f7afb2b380fc60ff75aecef4e633e243888 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>