Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Skip to content
Commit cdff9ddf authored by Kenny Root's avatar Kenny Root Committed by Android Git Automerger
Browse files

am 541e0d6d: resolved conflicts for merge of 6fb172b1 to jb-mr2-dev-plus-aosp 

* commit '541e0d6d':
  keystore: Add flag for blobs to be unencrypted
parents ebbfda91 541e0d6d
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