Skip to content
Commit 754ddca7 authored by Ricky Wai's avatar Ricky Wai Committed by android-build-merger
Browse files

Merge "Add resetKeyStore() in LockSettingsService" into nyc-dev 

am: 1cb6f9d8

* commit '1cb6f9d8':
  Add resetKeyStore() in LockSettingsService

Change-Id: I6af43eb9f472c1d5a1f9356a9b618a183200e38e
parents 7c46f928 1cb6f9d8
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