Skip to content
Commit 14281a13 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 am: 05b27bd2

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



Change-Id: I64448c49c3cdc0f061d0a9e9107c96ed103f4167
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 821eb602 05b27bd2
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