| commit | b1369b978da726d3cb0b4e4ed85dc7ab8736c20c | [log] [tgz] |
|---|---|---|
| author | Marzia Favaro <marziana@google.com> | Mon Sep 18 23:31:40 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Sep 18 23:31:40 2023 +0000 |
| tree | 695593c9d63cd6d6c7ff43dfc4982029e98fc43e | |
| parent | a098c85888f982902276775b626dc73711258c84 [diff] | |
| parent | b65d07a0d6c095d253badf7344a8c5eb517f9d29 [diff] |
[automerger skipped] Require permission to unlock keyguard am: 41bc7c0042 -s ours am: 1bedc66ed3 -s ours am: 5e35aad2a2 -s ours am: 1d42887320 -s ours am: 3f83e911be -s ours am: b65d07a0d6 -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/+/24342145 Change-Id: Ie6f3f829ff9da210b83818cfffb6f91d1b9b6bfe Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>