| commit | 3875aac04b193ff69e21803f15cb94541f14008e | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Mon Nov 30 13:51:31 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Nov 30 13:51:31 2020 +0000 |
| tree | 83ab818a2571b7e93d23bc464f92e7069220e638 | |
| parent | 43c0e2a139d4ad7a70add680b885bf70fd848807 [diff] | |
| parent | c954cae54b53cdf30edfaed68fbe9a7f7c6ece91 [diff] |
Merge "Keystore 2.0 SPI: Make LockSettingsService tolerate the Keystore 2.0 SPI" am: c954cae54b Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1471566 Change-Id: Iece3c430fe0813104aaf062afcdef26fed0cebbe