Skip to content
Commit 9741311b authored by Janis Danisevskis's avatar Janis Danisevskis Committed by Automerger Merge Worker
Browse files

Merge "Keystore 2.0 SPI: Add CERTIFICATE_* tags." am: 14a82f79 am: 4b875e55 am: fccde53e 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1d1e8eda85dc9c415fea10a23f345d94da8b2290
parents 5a0c28dc fccde53e
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