| commit | 4a423681a2054d4d283a58bcaed42fd70d1d0dce | [log] [tgz] |
|---|---|---|
| author | Marzia Favaro <marziana@google.com> | Mon Sep 18 13:32:50 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Sep 18 13:32:50 2023 +0000 |
| tree | d22e43d87915f03a03a00de7b5182cafec444afa | |
| parent | 335226c8d2ea07f8f206be11baf09e47a4a603b3 [diff] | |
| parent | 3cc39d59173e1a523d4e9a496631445d33bf561c [diff] |
[automerger skipped] Merge "Require permission to unlock keyguard" into udc-qpr-dev am: fe5181973b -s ours am: 3cc39d5917 -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/+/24339447 Change-Id: I4df948c09d2532c205274b26aaeac1f6303a3802 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>