| commit | 212a433a38417462a82b54c2f624baff00817d74 | [log] [tgz] |
|---|---|---|
| author | Marzia Favaro <marziana@google.com> | Mon Sep 18 14:26:45 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Sep 18 14:26:45 2023 +0000 |
| tree | 44ce592f066fe05982bc94b7d75e532b9bd431bc | |
| parent | 3743abeff9bb85637c1d03ec34a55895d3011fbe [diff] | |
| parent | 4d46e9c7d8da8fd7904989e7afbbc968cd32c0f5 [diff] |
[automerger skipped] Merge "Require permission to unlock keyguard" into udc-dev am: 07731fb247 -s ours am: 5efd73bc0f -s ours am: 4d46e9c7d8 -s ours am skip reason: Merged-In I7ba7e56f954c8e6f1f734311f735215918975bc6 with SHA-1 9ef8ef1dc5 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24339445 Change-Id: Ieaa7953ea84df60e8a33251f3924d6e53252abb2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>