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

Merge "Integrate IKeystoreUserManager aidl with LockSettingsService." am: bfc1f6b3 am: 7fa15840 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I97ec4f0aa946c4847aaa5ff1ddc77c0d133d65f7
parents 2540861d 7fa15840
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