summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Marzia Favaro <marziana@google.com> 2023-09-18 22:19:26 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-09-18 22:19:26 +0000
commitb9ebddc1eb34ea0acd278114e180d12de1dc75c5 (patch)
tree261dc8c3231b76008dfe261612e0025f8bfed58e
parent9b4eb45a817023a4b7a2a6b69cc9866d2c0d4b26 (diff)
parent80cee4594bacc4f630bf2c7733dce8c1b1290143 (diff)
[automerger skipped] Merge "Require permission to unlock keyguard" into sc-qpr1-dev am: aac427df4c -s ours am: 8fbbc0c975 -s ours am: 3371c14a70 -s ours am: 306ac20464 -s ours am: 8f78484790 -s ours am: 3b02f9e5bd -s ours am: d933d764d0 -s ours am: 80cee4594b -s ours
am skip reason: Merged-In I7ba7e56f954c8e6f1f734311f735215918975bc6 with SHA-1 6568e40be9 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24342144 Change-Id: I6502eed2230b13a70c37e107d6e931e22c4fe614 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
0 files changed, 0 insertions, 0 deletions