Skip to content
Commit ddf391d4 authored by Paul Crowley's avatar Paul Crowley Committed by android-build-merger
Browse files

[automerger skipped] Merge "v3 keys use SP800 derivation" into pi-dev am: 83924aca 

am: 930efcaf -s ours
am skip reason: change_id Ia5bdc9acaa8d37605088abcfb0037581eb6494c2 with SHA1 0d40d6e7 is in history

Change-Id: Idab71018ff09c4c962716078a5c472598f8568c6
parents 3e8a69cd 930efcaf
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