commit | d0e3d74f8e5e936c47a6b0487cf1c2fe1c664ada | [log] [tgz] |
---|---|---|
author | Marzia Favaro <marziana@google.com> | Sat Sep 16 04:15:05 2023 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Sep 16 04:15:05 2023 +0000 |
tree | 46177c9a7701d44dcb37c891ce9e0694a6d66320 | |
parent | deae332c7500b91a8d99600a06f51bc72f92d82b [diff] | |
parent | 8cb79e20bbf73af15180aba8da04355015360aed [diff] |
[automerger skipped] Merge "Require permission to unlock keyguard" into rvc-dev am: 78b272400f -s ours am: 30316315ae -s ours am: 8ba2179244 -s ours am: f72e484da4 -s ours am: 790fbfb359 -s ours am: 8dd736d39c -s ours am: f4f4929a4d -s ours am: a8c8808a32 -s ours am: 3fcc68b0f9 -s ours am: e2fa797776 -s ours am: 208d69ed09 -s ours am: 8cb79e20bb -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/+/24341231 Change-Id: Ic1e73a5448824855a2021c88d12531e150457e44 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>