Skip to content
Commit a2f498b8 authored by Eric Biggers's avatar Eric Biggers Committed by Android (Google) Code Review
Browse files

Merge changes I6707b6f3,I815151cc into main 

* changes:
  Load reboot escrow data at PHASE_BOOT_COMPLETED
  Ensure that LockSettingsService waits for gatekeeperd to be ready
parents 45197e2b 042cd5d9
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