| commit | 5bc496086394ab44482286fd41990304d0dff13a | [log] [tgz] |
|---|---|---|
| author | Marzia Favaro <marziana@google.com> | Mon Sep 18 18:52:47 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Sep 18 18:52:47 2023 +0000 |
| tree | 2399ad67a9f64fe349e47f08e0eac7a15df895bc | |
| parent | 0bfd492240521fe83d97c69b5616c166d9ddeda4 [diff] | |
| parent | 2964d2acf8ad173c7e1c2d163360b1f84c12506f [diff] |
[automerger skipped] Merge "Require permission to unlock keyguard" into tm-dev am: 1d243469a6 -s ours am: 2964d2acf8 -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/+/24342145 Change-Id: Ida3ba7c89fce36fad11e67cb51de6ba66cc96569 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>