| commit | 2e3d9ce05f89a90e92785b375bbbf6f58de55c9c | [log] [tgz] |
|---|---|---|
| author | Marzia Favaro <marziana@google.com> | Wed Sep 20 11:27:48 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Sep 20 11:27:48 2023 +0000 |
| tree | 7b271f6cd5c4d211994868f32b538ac6ad0693c1 | |
| parent | 678610db010a85c6876706e9c1f52db799a7e8f0 [diff] | |
| parent | 6f0262fe7b6bfe75b57b80c08a1990c6d2b56d1c [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 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: Ic7bb736a4c745b18bd9f6d7fbb8d3035aecb77f9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>