| commit | 0a1d9d034cbd9554069564cce1d86c206eb9a22f | [log] [tgz] |
|---|---|---|
| author | Marzia Favaro <marziana@google.com> | Wed Sep 20 11:26:34 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Sep 20 11:26:34 2023 +0000 |
| tree | 7b271f6cd5c4d211994868f32b538ac6ad0693c1 | |
| parent | 5355aaa46eb8eb58a3a0eae3d9317d84abbf868d [diff] | |
| parent | 4bb98f38c588d2fa6c85569184c311d5343d1b44 [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 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: Iaf52cf0e9e0acf9d43de5f6e0ccad27c50ba1c6a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>