| commit | 1824b2d45b200d0097a1fd8f1ecacda05f1a8f8a | [log] [tgz] |
|---|---|---|
| author | Marzia Favaro <marziana@google.com> | Mon Sep 18 23:28:01 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Sep 18 23:28:01 2023 +0000 |
| tree | 695593c9d63cd6d6c7ff43dfc4982029e98fc43e | |
| parent | 88b7ebeceeae6a01ca208f330ea099be68d52493 [diff] | |
| parent | 9e85b1b2f68bf4ff307d2bbb38632558d498ac05 [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: b651c3cee8 -s ours am: 9e85b1b2f6 -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: I20b8a8537ff37ead0f34ef43855b9802bd1cdfd3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>