| commit | d5d56cf441c585d484be448f7224dc68be33b016 | [log] [tgz] |
|---|---|---|
| author | Marzia Favaro <marziana@google.com> | Mon Sep 18 18:47:31 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Sep 18 18:47:31 2023 +0000 |
| tree | 6840bfa8c6a1c5546610092e54cfdf2f4badb60b | |
| parent | 1cb52a9c10bcc1b00a42286fb34ca26ebe20264f [diff] | |
| parent | 7c2b1325e9816267f7144f5a482130e15696e5d0 [diff] |
[automerger skipped] Require permission to unlock keyguard am: 7f28e3eaaf -s ours am: cbdde0eb62 -s ours am: f4eace9709 -s ours am: 7c2b1325e9 -s ours am skip reason: Merged-In I7ba7e56f954c8e6f1f734311f735215918975bc6 with SHA-1 712ec1f4f8 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24339446 Change-Id: Ie567eb03d04f477060995c11673f954052da3cc1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>