| commit | c1e069ef40dbff7b0c76e1efa0f8ed90f4867659 | [log] [tgz] |
|---|---|---|
| author | Marzia Favaro <marziana@google.com> | Mon Sep 18 17:59:52 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Sep 18 17:59:52 2023 +0000 |
| tree | 5ab439f822f32dde2fb2955987298fa8844f97b9 | |
| parent | cbdde0eb62709a974dc1b30e60c1f58c2f94643f [diff] | |
| parent | b25ee8669f40e7d30dd176699651fd1f7ca0e700 [diff] |
[automerger skipped] Merge "Require permission to unlock keyguard" into sc-dev am: b25ee8669f -s ours am skip reason: Merged-In I7ba7e56f954c8e6f1f734311f735215918975bc6 with SHA-1 712ec1f4f8 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24339446 Change-Id: I39b9bed752e2e35dbda134f01d405fbefc405a49 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>