Skip to content
Commit d91def89 authored by David Zeuthen's avatar David Zeuthen Committed by Automerger Merge Worker
Browse files

Merge "PackageManager: Add FEATURE_HARDWARE_KEYSTORE, modify... 

Merge "PackageManager: Add FEATURE_HARDWARE_KEYSTORE, modify FEATURE_STRONGBOX_KEYSTORE." am: b0a08c82 am: a911b5da

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

Change-Id: Iafd15441005b71103cea730967ad7f3dccc111dd
parents 301f4a5f a911b5da
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