commit | 8aaad2a211f2f28c95f89ae1d624132aebb99f1d | [log] [tgz] |
---|---|---|
author | Marzia Favaro <marziana@google.com> | Fri Sep 15 18:17:40 2023 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 15 18:17:40 2023 +0000 |
tree | 6d5a6a3d92aae7970d0538e73e028daceca36d65 | |
parent | 7bfeb1b9b388846ae2d223ffa690e80ffa592c40 [diff] | |
parent | 89a3862e5d389a88ecd6a974a28648e0e3747314 [diff] |
Merge "Require permission to unlock keyguard" into rvc-qpr-dev am: 324d8033ba am: 4397e74103 am: 89a3862e5d Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24341230 Change-Id: I7c874de4a08a573e47390485c122970898398822 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>