commit | 57e4f2bb6e858458df01a7afd8ddf85cdcbad595 | [log] [tgz] |
---|---|---|
author | Marzia Favaro <marziana@google.com> | Mon Sep 18 22:25:18 2023 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Sep 18 22:25:18 2023 +0000 |
tree | 22661ac57cd423cb3d5bb9356fa8b6b23d87f30f | |
parent | 37e5ffe7ae2864f725772567639ed5b46aa8d61a [diff] | |
parent | cef4976db09094e7a084e8fc1068bbc056feb8ec [diff] |
[automerger skipped] Require permission to unlock keyguard am: 7f28e3eaaf -s ours am: cbdde0eb62 -s ours am: f4eace9709 -s ours am: 7c2b1325e9 -s ours am: d5d56cf441 -s ours am: efa9ffae6a -s ours am: cef4976db0 -s ours am skip reason: Merged-In I7ba7e56f954c8e6f1f734311f735215918975bc6 with SHA-1 712ec1f4f8 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24339446 Change-Id: I85f440d3b03799401f7a3709dd6674ebac66cbfb Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>