| commit | 21752ade7fed11211137cdf8a2d97e9a27f39618 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Mon Nov 30 14:27:39 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Nov 30 14:27:39 2020 +0000 |
| tree | e3187cbfc25ccb46a37e1f00591ca9197b9ac817 | |
| parent | 5071265e749be03312a849bf3cd48d16a7670f7d [diff] | |
| parent | 3875aac04b193ff69e21803f15cb94541f14008e [diff] |
Merge "Keystore 2.0 SPI: Make LockSettingsService tolerate the Keystore 2.0 SPI" am: c954cae54b am: 3875aac04b Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1471566 Change-Id: I2118a976e44d0ebab3a6c004a3a2183ea09d9ce7