diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-04-08 18:14:54 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-08 18:14:54 +0000 |
| commit | 41069eb17ec603942f6297e0d2e095cc1544ca2c (patch) | |
| tree | 3cdc1aa1d2b74dd636495a78219bd6ed761fbd89 /services/java/com/android/server/SystemServer.java | |
| parent | a8cfbe87c04ae01c582a2bd447544a0b2cb9d6cf (diff) | |
| parent | 1a4f20ceac9db52e61786b487757b76db6abbf5a (diff) | |
Merge "Keystore 2.0 SPI: Make getAttestationIds return an empty array." am: 1f82f476c0 am: cf64e636a8 am: 1a4f20ceac
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1664321
Change-Id: I8c1146a0b86cfca21bf9f3e837b4315cca3d5f86
Diffstat (limited to 'services/java/com/android/server/SystemServer.java')
0 files changed, 0 insertions, 0 deletions