commit | 0bfd492240521fe83d97c69b5616c166d9ddeda4 | [log] [tgz] |
---|---|---|
author | Marzia Favaro <marziana@google.com> | Mon Sep 18 18:52:41 2023 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Sep 18 18:52:41 2023 +0000 |
tree | 2399ad67a9f64fe349e47f08e0eac7a15df895bc | |
parent | a8c8808a3295d5e2506e5bb0569b5bd94f6b2c49 [diff] | |
parent | d7cadc037809ced4516d7f1434c32f0f2e03a9e1 [diff] |
[automerger skipped] Require permission to unlock keyguard am: 41bc7c0042 -s ours am: d7cadc0378 -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: I6ae42cd9e14e87fc8617cf8e7fe7a7495e506167 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>