Skip to content
Commit 35ee3e1b authored by Justin Weir's avatar Justin Weir Committed by Android (Google) Code Review
Browse files

Merge changes Id3a155a2,Ifbb9dfe3 into tm-qpr-dev 

* changes:
  Disable shade open when FRP is active
  Add FRP setting to DeviceProvisionController
parents d319f10c 421cf7df
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