Skip to content
Commit 84839730 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Revert "Revert "Keystore SPI: Initialize KeymasterDefs contants with... 

Merge "Revert "Revert "Keystore SPI: Initialize KeymasterDefs contants with AIDL generated enums""" am: c565f2bd am: 563c167f am: f1d47c7b

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

Change-Id: Iaae86ff91e2faee4340a37ec34fd76798247f8d4
parents 10963d5b f1d47c7b
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