| commit | 14b6d15afe123d5b3919733fcba41e808f040be2 | [log] [tgz] |
|---|---|---|
| author | Marzia Favaro <marziana@google.com> | Sat Sep 16 04:14:01 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Sep 16 04:14:01 2023 +0000 |
| tree | 46177c9a7701d44dcb37c891ce9e0694a6d66320 | |
| parent | f7580e528d0da2f4437fc3172ff0eb06ac0c4c32 [diff] | |
| parent | bfd1ea04148eb9c9e8e981616bec53cec799e131 [diff] |
[automerger skipped] Merge "Require permission to unlock keyguard" into rvc-qpr-dev am: 324d8033ba am: 4397e74103 am: 89a3862e5d am: 8aaad2a211 am: c4e7a6081e am: 17405aa591 am: 13f4d4f471 -s ours am: aa805d1ff6 -s ours am: 33759f925a -s ours am: f4ed1e5406 -s ours am: bfd1ea0414 -s ours am skip reason: Merged-In I7ba7e56f954c8e6f1f734311f735215918975bc6 with SHA-1 9ef8ef1dc5 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24341230 Change-Id: Ib1a9b06ff97a138809124d1453b725afe6239390 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>