Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a4b17398 authored by Josep del Río's avatar Josep del Río Committed by Automerger Merge Worker
Browse files

Merge "hasKeycodeLocked() also checks usage codes" am: 8521bfe7 am:... 

Merge "hasKeycodeLocked() also checks usage codes" am: 8521bfe7 am: c224482a am: 48a44019 am: d618fcc6

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2514955



Change-Id: I2a99ee0991f9bd4afe65aa7e9eb498beba0e9aa6
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5f06a154 d618fcc6
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment