| commit | f01b84bebf104e84e2fecbef1b3a62e4b6d06af1 | [log] [tgz] |
|---|---|---|
| author | Marzia Favaro <marziana@google.com> | Mon Sep 18 23:13:27 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Sep 18 23:13:27 2023 +0000 |
| tree | 5ede10fd11f9e3d5f07c6ece27d2333fa19a0197 | |
| parent | b65d07a0d6c095d253badf7344a8c5eb517f9d29 [diff] | |
| parent | 3d9569cacc755b8e23b3916e6e3a3fa2590e2b4a [diff] |
[automerger skipped] Merge "Require permission to unlock keyguard" into tm-dev am: 1d243469a6 -s ours am: a8da8cbb7f -s ours am: 1cd2cab28c -s ours am: 337a5c8681 -s ours am: 3d9569cacc -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/+/24342145 Change-Id: Ic3e5c0d6dfa025a02a60cdae5bbd60216dabf4b8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>