| commit | 917ea604913ea60c1aefc516b8a687cb08fe5590 | [log] [tgz] |
|---|---|---|
| author | Marzia Favaro <marziana@google.com> | Mon Sep 18 23:33:43 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Sep 18 23:33:43 2023 +0000 |
| tree | 695593c9d63cd6d6c7ff43dfc4982029e98fc43e | |
| parent | b0f48224481edbb3bac7bb3e075f9ed484c69768 [diff] | |
| parent | 721f63fd6658b3c3627afebb34c7d2d97cfbe21c [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: e17affc8d4 -s ours am: d6f9187710 -s ours am: 72bb18337c -s ours am: 4357778726 -s ours am: 721f63fd66 -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: Ide75fb6c743aefd26017d7bd73c25dd529d274bf Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>