| commit | 1b2200b9a8d3803669b02ae74c476ed96184e586 | [log] [tgz] |
|---|---|---|
| author | Marzia Favaro <marziana@google.com> | Mon Sep 18 22:31:39 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Sep 18 22:31:39 2023 +0000 |
| tree | b665ad8977b76f72750ccdac72984896e863f618 | |
| parent | 311784c9a3127ab026f1554b953a00005db1dc4d [diff] | |
| parent | 10d2c1f67730615d9a987b8a19eea76cfcf63530 [diff] |
[automerger skipped] Merge "Require permission to unlock keyguard" into sc-dev am: b25ee8669f -s ours am: c1e069ef40 -s ours am: 75495d90ae -s ours am: bedfad328a -s ours am: ed66255cab -s ours am: 1e4cc975ff -s ours am: 5c31ee97b0 -s ours am: 10d2c1f677 -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: I97b620bf26c445ab79f2b940fd2b1e2ff00885f6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>