Skip to content
Commit 1541f9f3 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Use std::string to return crypto device, not char *" am: 80731b09 am: 2381810b 

Change-Id: Ic7683749f4974ccdf251b7351110a1e3663536b7
parents ebbabdc8 2381810b
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