| commit | e61a5274a582ae752d54d54ea12e303e4eb2df4d | [log] [tgz] |
|---|---|---|
| author | Marzia Favaro <marziana@google.com> | Mon Sep 18 19:44:38 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Sep 18 19:44:38 2023 +0000 |
| tree | 71e5b12a06e8eda0703b07a616806867c44c5241 | |
| parent | fab8f3c351c0dc8412074126e7325be58692f466 [diff] | |
| parent | efa9ffae6af2cff9215913bc8fb976672b3db676 [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: d5d56cf441 -s ours am: efa9ffae6a -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: I99095c31bb63de4ac66c1e1d2daba9b05a32c02f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>