| commit | ae0a9fd780a3697d5e75cc3e187f149a1468bf5e | [log] [tgz] |
|---|---|---|
| author | Marzia Favaro <marziana@google.com> | Mon Sep 18 13:33:42 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Sep 18 13:33:42 2023 +0000 |
| tree | 82717ad3bb304a15ed2998259af96738a7fefb09 | |
| parent | 03c2b5f458ff0d39e430e9614224b766d1b82237 [diff] | |
| parent | 8e87b86453583dc3eb46d7a687b41cad944649e5 [diff] |
[automerger skipped] Merge "Require permission to unlock keyguard" into udc-dev am: 07731fb247 -s ours am: 8e87b86453 -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: I33f9047c2f665b1c5d9b83c1435a5c98fe73e3a1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>