| commit | f6d35a5b1fc58a13d6f5c494f1749c50cd004711 | [log] [tgz] |
|---|---|---|
| author | Marzia Favaro <marziana@google.com> | Wed Sep 20 12:09:13 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Sep 20 12:09:13 2023 +0000 |
| tree | 54b30ea9d108f38e4b4624441f30522871126f15 | |
| parent | e8ef521560102efa3c7a96b55092b1c45d375b9a [diff] | |
| parent | 2e3d9ce05f89a90e92785b375bbbf6f58de55c9c [diff] |
[automerger skipped] Merge "Require permission to unlock keyguard" into tm-qpr-dev am: bc9059ae54 -s ours am: 3946267559 -s ours am: 6f0262fe7b -s ours am: 2e3d9ce05f -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: I4fb0324e5c5e331a68180abe7bc87bb49c172bd9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>