| commit | 59c444b80c22b8ebab98c9230390e916e6837437 | [log] [tgz] |
|---|---|---|
| author | Marzia Favaro <marziana@google.com> | Mon Sep 18 19:42:37 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Sep 18 19:42:37 2023 +0000 |
| tree | e90781ad8807230e77995bd0b11c6f8474bba90d | |
| parent | 06febd6d52b34bf9d4dcb9376b72fdbb84d14085 [diff] | |
| parent | 33f66cdb7ae3129ffb296bd8d05d023f560a9f70 [diff] |
[automerger skipped] Require permission to unlock keyguard am: 712ec1f4f8 -s ours am: 8e952270a0 -s ours am: 17b2d055ad -s ours am: 5578bf029b -s ours am: 33f66cdb7a -s ours am skip reason: Merged-In I7ba7e56f954c8e6f1f734311f735215918975bc6 with SHA-1 6568e40be9 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24342144 Change-Id: I52e211d467ade1ef3a7d22e557a7de95a5368d45 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>