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

Merge "Keystore 2.0: Add @IntDef for Keystore namespaces." am: faabd1a8 am:... 

Merge "Keystore 2.0: Add @IntDef for Keystore namespaces." am: faabd1a8 am: 15d9a3ab am: a32dc0fb

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

Change-Id: I9059f8c84bf57ea2668ea1209d2a2125796bb178
parents 511dd1dc a32dc0fb
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