Skip to content
Commit 95290b22 authored by Janis Danisevskis's avatar Janis Danisevskis Committed by Automerger Merge Worker
Browse files

Merge "Keystore SPI: Initialize KeymasterDefs contants with AIDL generated... 

Merge "Keystore SPI: Initialize KeymasterDefs contants with AIDL generated enums" am: 136fcd2a am: 1a59bf1d am: 6dd16855

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1475677

Change-Id: I919b08cd59919c32bc6f94d1c61c25c9a7931f57
parents 551b6f0b 6dd16855
Expand all Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment