commit | 159651941608320997b83330e2b50b36391e2c8a | [log] [tgz] |
---|---|---|
author | Marzia Favaro <marziana@google.com> | Mon Sep 18 20:27:13 2023 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Sep 18 20:27:13 2023 +0000 |
tree | a731a05dd2f75880024316c60d3b8f8393fc0541 | |
parent | bf14efdbdfd6aff1f1f48fc41ce2061b7a22b880 [diff] | |
parent | 33e953ec2d1db009b9e3bae4693f5bfb5746bdb2 [diff] |
[automerger skipped] Require permission to unlock keyguard am: 712ec1f4f8 -s ours am: 8e952270a0 -s ours am: 17b2d055ad -s ours am: 435be105e5 -s ours am: 33e953ec2d -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: I03704f7e387827421acce54fff218b3f8c5f54f7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>