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

Merge "Keystore 2.0: Android Protected Confirmation" am: 30841f17 am: 3443d2b6 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I034d45f1afcdd07c0b12e2db7e4134b695ec5c70
parents 5f2d59fd 3443d2b6
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