| commit | af0c9c23757278dadaef42412b7d3bb7ab80ebc1 | [log] [tgz] |
|---|---|---|
| author | Marzia Favaro <marziana@google.com> | Fri Sep 15 19:55:05 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 15 19:55:05 2023 +0000 |
| tree | 74e7ef040b9f4f8dcc356542909059e7fb504d3f | |
| parent | 17405aa5918e63e78e26fe12313674dfdc5ac8a1 [diff] | |
| parent | 511dee9523ec0d8430c2c6f49473268556c50acb [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 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: I8da7e60dbc17f3d3ea66b312600554409776e4b3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>