Skip to content
Commit 9c975f23 authored by Paul Crowley's avatar Paul Crowley Committed by Automerger Merge Worker
Browse files

Merge changes from topic "biometric-unlocked-required" am: c36995ec am: cf5f4d6c 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1671106

Change-Id: I47281e410de8edf621836a501596419ea0cc1d7c
parents a4f89e68 cf5f4d6c
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment