| commit | e17affc8d4fec74aea75325089df287186620190 | [log] [tgz] |
|---|---|---|
| author | Marzia Favaro <marziana@google.com> | Mon Sep 18 18:47:36 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Sep 18 18:47:36 2023 +0000 |
| tree | 6840bfa8c6a1c5546610092e54cfdf2f4badb60b | |
| parent | d5d56cf441c585d484be448f7224dc68be33b016 [diff] | |
| parent | bedfad328a47b431a2f9a2e1c1fa4c4054b44e7c [diff] |
[automerger skipped] Merge "Require permission to unlock keyguard" into sc-dev am: b25ee8669f -s ours am: c1e069ef40 -s ours am: 75495d90ae -s ours am: bedfad328a -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: I2b061e3ccaf9bcf12cb4dedfacabff24d9211255 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>