| commit | d44156ce7197ebd80b781886966c888e15484d5c | [log] [tgz] |
|---|---|---|
| author | Marzia Favaro <marziana@google.com> | Fri Sep 15 21:44:00 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 15 21:44:00 2023 +0000 |
| tree | aad25af4559d92a8c563c7fc90ccf7de8e357759 | |
| parent | 0c8f6e30a74d4657376576e63a02e6f46498f7ff [diff] | |
| parent | 8a68b03e84f66a6dba891c1a73563571600f72fd [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: af0c9c2375 -s ours am: 9aab2e9f1f -s ours am: 8a68b03e84 -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: I1e875eadd267dae0b5327a1cbcfbc1a79c848d90 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>