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

Merge "Keystore 2.0 SPI: Make LockSettingsService tolerate the Keystore 2.0... 

Merge "Keystore 2.0 SPI: Make LockSettingsService tolerate the Keystore 2.0 SPI" am: c954cae5 am: 3875aac0

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

Change-Id: I2118a976e44d0ebab3a6c004a3a2183ea09d9ce7
parents 5071265e 3875aac0
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