| commit | 75495d90aeb5d1b97d31b1be443f01ed06b450b2 | [log] [tgz] |
|---|---|---|
| author | Marzia Favaro <marziana@google.com> | Mon Sep 18 18:02:43 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Sep 18 18:02:43 2023 +0000 |
| tree | 7f6c3d16a02edb75048fd479cfbca8940bd79c6f | |
| parent | f4eace9709c3b9530b40e30ceb851bdae1790068 [diff] | |
| parent | c1e069ef40dbff7b0c76e1efa0f8ed90f4867659 [diff] |
[automerger skipped] Merge "Require permission to unlock keyguard" into sc-dev am: b25ee8669f -s ours am: c1e069ef40 -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: I68303ce785531087cedcefdfdbad7b1457dd42c5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>