commit | 2048297256564ed672e8df74d592d7bd02952d67 | [log] [tgz] |
---|---|---|
author | Marzia Favaro <marziana@google.com> | Fri Sep 15 21:43:49 2023 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 15 21:43:49 2023 +0000 |
tree | 65e1358bf8c677a85c631bd0cdeaa641403da81c | |
parent | 7bc2322a032ee8fcf5a903b0c6d3b88313a80748 [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: I734085416b1f5e21c8cc2808772bbe17e88e9986 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>