commit | 24dcecc3e46bc750902dbec35c13d80f01a30d15 | [log] [tgz] |
---|---|---|
author | Marzia Favaro <marziana@google.com> | Sat Sep 16 03:32:41 2023 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Sep 16 03:32:41 2023 +0000 |
tree | 46177c9a7701d44dcb37c891ce9e0694a6d66320 | |
parent | 79837e5aaec88348a75645d7e2dc6e3f786b8efd [diff] | |
parent | ab7f7988de24f0792cb7511f7e37f3f2016f0a0b [diff] |
[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: ab7f7988de -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: If991b1656b452cf95a17630012ccf5099c941655 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>