tree e64ea53c55a402f6e10fa22bf533c8043e0568a6
parent fce7641388ef1d2a0153ae11070ce7d88305ac60
parent 1a59bf1dc226f0ef12f4f0b5497955fb494c0b5c
author Janis Danisevskis <jdanis@google.com> 1606511606 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1606511606 +0000

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