| commit | e9b144a393a8ce0d0231e3dba5d069f5540939d8 | [log] [tgz] |
|---|---|---|
| author | Marzia Favaro <marziana@google.com> | Mon Sep 18 13:32:05 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Sep 18 13:32:05 2023 +0000 |
| tree | 82717ad3bb304a15ed2998259af96738a7fefb09 | |
| parent | f45c923ae007c9e923c8cc1293c455412a5b1955 [diff] | |
| parent | 5efd73bc0fae693bb4a5d1abd2ef959ec854427b [diff] |
[automerger skipped] Merge "Require permission to unlock keyguard" into udc-dev am: 07731fb247 -s ours am: 5efd73bc0f -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: I0eaf8235787aaeae8f3b1e0895a2545536bb88c5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>