| commit | 6f0262fe7b6bfe75b57b80c08a1990c6d2b56d1c | [log] [tgz] |
|---|---|---|
| author | Marzia Favaro <marziana@google.com> | Wed Sep 20 10:25:06 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Sep 20 10:25:06 2023 +0000 |
| tree | 5f811f72f2fe9d134298296fd62425a64055fc98 | |
| parent | b43c1a34cc91adc3e32ac97e18630687be5d85da [diff] | |
| parent | 3946267559f0a445eefda8e3823ba64848a9eef6 [diff] |
[automerger skipped] Merge "Require permission to unlock keyguard" into tm-qpr-dev am: bc9059ae54 -s ours am: 3946267559 -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: Ia887c84b6bcbeb140c1eadbefd3cd881cded05e5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>