commit | 77955b229e62f9df2acf681620ea753270349929 | [log] [tgz] |
---|---|---|
author | Marzia Favaro <marziana@google.com> | Wed Sep 20 09:28:24 2023 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Sep 20 09:28:24 2023 +0000 |
tree | e90781ad8807230e77995bd0b11c6f8474bba90d | |
parent | 5c31ee97b03364d51b960ae9bd1c2657768b0154 [diff] | |
parent | 55b8322714f876cc1d36d5774c1c1f0c1101581b [diff] |
[automerger skipped] Require permission to unlock keyguard am: 55b8322714 -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: I15b360431fce66ad9ecac89129154b302b642b16 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>