OSDN Git Service

Merge "Add resetKeyStore() in LockSettingsService" into nyc-dev
authorRicky Wai <rickywai@google.com>
Thu, 26 May 2016 13:46:25 +0000 (13:46 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 26 May 2016 13:46:26 +0000 (13:46 +0000)
commit1cb6f9d8a4827d50e26bf83068a928e47c5c1f1e
treee83dfd353da858e6b32658c19a650368b087fa9d
parent610fb8a3f2dcdc66dbc4e31d92a08cc249b5ca7b
parent4613fe41ac9e817e76d7087de45bf01f4a6584d6
Merge "Add resetKeyStore() in LockSettingsService" into nyc-dev
core/java/com/android/internal/widget/ILockSettings.aidl
core/java/com/android/internal/widget/LockPatternUtils.java
services/core/java/com/android/server/LockSettingsService.java