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

Skip to content
Commit ff8b037c authored by Christopher Tate's avatar Christopher Tate
Browse files

am 777b8a80: am 422b2656: resolved conflicts for merge of c45ff35f to klp-modular-dev 

* commit '777b8a80':
  Adapt to underlying changes in the PBKDF2 implementation

Change-Id: Ia68694a03e52693fceaedc6740dbd8e690e21257
parent 2665f6e9
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