Skip to content
Commit faefa763 authored by Bram Bonné's avatar Bram Bonné Committed by Automerger Merge Worker
Browse files

Merge "Adds two missing Keymaster definitions." am: 6d7e4c43 

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

Change-Id: Ib17609b0e8a1b40dd412692e70af9fedd2022325
parents 6975aa85 6d7e4c43
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