Skip to content
Commit 287bbbc9 authored by Hao Dong's avatar Hao Dong Committed by Android (Google) Code Review
Browse files

Merge "[conflict] Add onUdfpsUiEvent() and callbacks on overlay shown in... 

Merge "[conflict] Add onUdfpsUiEvent() and callbacks on overlay shown in FingerprintManager. am: fc343495" into udc-qpr-dev
parents 7490d9e8 6bcebb20
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