| commit | 269c0cfe681cd226f07b9ecf547681128ec7493c | [log] [tgz] |
|---|---|---|
| author | Marzia Favaro <marziana@google.com> | Wed Sep 20 12:08:35 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Sep 20 12:08:35 2023 +0000 |
| tree | 54b30ea9d108f38e4b4624441f30522871126f15 | |
| parent | 180adcfe38b9e14078a711678be2dd1669a16518 [diff] | |
| parent | 0a1d9d034cbd9554069564cce1d86c206eb9a22f [diff] |
[automerger skipped] Merge "Require permission to unlock keyguard" into tm-qpr-dev am: bc9059ae54 -s ours am: 3946267559 -s ours am: 4bb98f38c5 -s ours am: 0a1d9d034c -s ours am skip reason: Merged-In I7ba7e56f954c8e6f1f734311f735215918975bc6 with SHA-1 6568e40be9 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24342146 Change-Id: Id186d11ded1595656e75dda451675c3ff985e2d1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>