| commit | 4d46e9c7d8da8fd7904989e7afbbc968cd32c0f5 | [log] [tgz] |
|---|---|---|
| author | Marzia Favaro <marziana@google.com> | Mon Sep 18 13:35:37 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Sep 18 13:35:37 2023 +0000 |
| tree | 7f4c86952ba6b2bd5d83ebdfbedffc8d74da8f22 | |
| parent | ed480a790f59dd9853b21f35a17ff1139554e2c1 [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: Ib851b5f276205ff32f8387c848da06b643671517 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>