Skip to content
Commit 5af8088b authored by Adrian Roos's avatar Adrian Roos Committed by android-build-merger
Browse files

Merge "Merge "Fingerprint: Show bouncer when fingerprint is disallowed" into... 

Merge "Merge "Fingerprint: Show bouncer when fingerprint is disallowed" into oc-dr1-dev am: 544e628e am: 8775ad8f" into oc-mr1-dev-plus-aosp
am: 82eb2646

Change-Id: Iee3c87347e573eadc21ce1973f57bc3a83f7bd6b
parents c622a021 82eb2646
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