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

Skip to content
Commit bba8fbc9 authored by Christopher Tate's avatar Christopher Tate Committed by Android Git Automerger
Browse files

am 943cdf7e: (-s ours) am 777b8a80: am 422b2656: resolved conflicts for merge... 

am 943cdf7e: (-s ours) am 777b8a80: am 422b2656: resolved conflicts for merge of c45ff35f to klp-modular-dev

* commit '943cdf7e':
  Adapt to underlying changes in the PBKDF2 implementation
parents 2665f6e9 943cdf7e
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