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

Merge "Keystore 2.0: Add namespace locksettings." am: 6bcd65c9 am: 965c7e3c 

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

Change-Id: Ib74fb9b45bd952dfaafd6f3dc65d4bcae304b418
parents 87a31295 965c7e3c
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