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

Commit d618fcc6 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: c224482a am: 48a44019 

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



Change-Id: Ic0ce48b297bb9040d919e6c94d2398fdd1187ac7
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ecd41c77 48a44019
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