Skip to content
Commit 05b27bd2 authored by Jeff DeCew's avatar Jeff DeCew Committed by Automerger Merge Worker
Browse files

Merge "Promote FSI Requires Keyguard feature from Teamfood to Droidfood" into... 

Merge "Promote FSI Requires Keyguard feature from Teamfood to Droidfood" into tm-qpr-dev am: 819a14c7

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



Change-Id: I748843b7b8924d4b599fd16996a4cb5085cd7e58
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 56f9a15e 819a14c7
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