Skip to content
Commit 5bf384ca authored by Tianjie Xu's avatar Tianjie Xu Committed by Gerrit Code Review
Browse files

Merge changes Id0e18bef,Ie2b5f559 

* changes:
  Wrap the escrow data with key from keystore
  Load and generate key from keystore in reboot escrow
parents 7ae76a2f f4c1cf66
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