| commit | 34b7f1b0532e17d189241e7fa4c7884f0f11f644 | [log] [tgz] |
|---|---|---|
| author | Marzia Favaro <marziana@google.com> | Mon Sep 18 17:22:06 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Sep 18 17:22:06 2023 +0000 |
| tree | a5d9609ce0d3e0682ab8a6cacfa60e6026e1dd73 | |
| parent | 240c8833c56a74ad26f63becd4d1c1c9eff66ddc [diff] | |
| parent | 8d2550344c47ea0023db30bca5d9df70dfdc6e4f [diff] |
[automerger skipped] Merge "Require permission to unlock keyguard" into udc-dev am: 07731fb247 -s ours am: 8d2550344c -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: Id5e3e7d522f0442ea37080d673ca130299126950 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>