Skip to content
Commit 1a4f20ce authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Keystore 2.0 SPI: Make getAttestationIds return an empty array." am:... 

Merge "Keystore 2.0 SPI: Make getAttestationIds return an empty array." am: 1f82f476 am: cf64e636

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

Change-Id: I7e790f590c81e8d0dcdf9693b9dc23d14f1ff90a
parents f7d6fde3 cf64e636
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