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