Skip to content
Commit 41069eb1 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 am: 1a4f20ce

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

Change-Id: I8c1146a0b86cfca21bf9f3e837b4315cca3d5f86
parents a8cfbe87 1a4f20ce
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