Skip to content
Commit 2199092f authored by Pavel Grafov's avatar Pavel Grafov Committed by Automerger Merge Worker
Browse files

Merge "Keystore 2.0: Add keystore engine grant string convenience functions."... 

Merge "Keystore 2.0: Add keystore engine grant string convenience functions." am: 4da629d9 am: 7e74123b am: 6776c214

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1569501

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7f2ba849f84956b95caa9d7b32e3967bafb99c18
parents 77528481 6776c214
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