| commit | 48b4ee955c454ba05f0c7aa76feedd3678b3ab47 | [log] [tgz] |
|---|---|---|
| author | Marzia Favaro <marziana@google.com> | Mon Sep 18 23:07:23 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Sep 18 23:07:23 2023 +0000 |
| tree | 261dc8c3231b76008dfe261612e0025f8bfed58e | |
| parent | 9e85b1b2f68bf4ff307d2bbb38632558d498ac05 [diff] | |
| parent | 23e70d13370e38d9d93098bd704e0467cddf7606 [diff] |
[automerger skipped] Require permission to unlock keyguard am: 41bc7c0042 -s ours am: d7cadc0378 -s ours am: 0bfd492240 -s ours am: 0f15084990 -s ours am: 65f6794d8a -s ours am: 23e70d1337 -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: Ie669c16d2ef314e43031b108db72cff2c5cfb947 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>