| commit | 95290b2266b67edfb4a715505f9c35069f346ec1 | [log] [tgz] |
|---|---|---|
| author | Janis Danisevskis <jdanis@google.com> | Fri Nov 27 21:58:40 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Nov 27 21:58:40 2020 +0000 |
| tree | e76747096f18357ca791978e1465b5ebc0e4b735 | |
| parent | 551b6f0bdeb837790c541eeb247818bed8ffe9e1 [diff] | |
| parent | 6dd168558e5bfabeacee7749b653136360c13074 [diff] |
Merge "Keystore SPI: Initialize KeymasterDefs contants with AIDL generated enums" am: 136fcd2a56 am: 1a59bf1dc2 am: 6dd168558e Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1475677 Change-Id: I919b08cd59919c32bc6f94d1c61c25c9a7931f57