| commit | c99d9b621402b12f99d2122dcc232b3ec9ab4ef0 | [log] [tgz] |
|---|---|---|
| author | Marzia Favaro <marziana@google.com> | Fri Sep 15 21:43:06 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 15 21:43:06 2023 +0000 |
| tree | aad25af4559d92a8c563c7fc90ccf7de8e357759 | |
| parent | eb4fd282c7aab0623dbb45ae4bcef2885f1a7def [diff] | |
| parent | d51ad40ab041ee23bc466dff40c0e24121e570a4 [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 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: I0a49b0013b3feab96212fd64f23940f01ba987ca Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>