commit | 2c5a90cc79322c5fe34778c13bd58cd7cd2f247f | [log] [tgz] |
---|---|---|
author | Marzia Favaro <marziana@google.com> | Fri Sep 15 23:30:40 2023 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 15 23:30:40 2023 +0000 |
tree | 1dd2ced83851a1da529da39caf7aa02811637f9f | |
parent | 2ee9667d02cbe0d1d5e4c8a39ec9b5a7e565276c [diff] | |
parent | 65818dfacc6909045d82f14e1ac5d03156818b07 [diff] |
Merge "Require permission to unlock keyguard" into rvc-qpr-dev am: 324d8033ba am: 4397e74103 am: 89a3862e5d am: 8aaad2a211 am: c4e7a6081e am: fa1f3f3cb0 am: ff53f5a273 am: c3f3831270 am: 65818dfacc Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24341230 Change-Id: Iec75764535473f0af6fa47bb01e6aea3b48577cf Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>