| commit | 5efd73bc0fae693bb4a5d1abd2ef959ec854427b | [log] [tgz] |
|---|---|---|
| author | Marzia Favaro <marziana@google.com> | Mon Sep 18 12:33:08 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Sep 18 12:33:08 2023 +0000 |
| tree | a731a05dd2f75880024316c60d3b8f8393fc0541 | |
| parent | 778fa0514787a1b3d6d3c36908f9fc491aead311 [diff] | |
| parent | 07731fb247a14ae04d825529060ac1630d856e06 [diff] |
[automerger skipped] Merge "Require permission to unlock keyguard" into udc-dev am: 07731fb247 -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: I34e7f1ec0061c43df220261d59ffbff628d17871 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>