OSDN Git Service

Merge "Add resetKeyStore() in LockSettingsService" into nyc-dev am: 1cb6f9d8a4
authorRicky Wai <rickywai@google.com>
Thu, 26 May 2016 14:35:45 +0000 (14:35 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 26 May 2016 14:35:45 +0000 (14:35 +0000)
commite30838fc76213cd8a634d67c5808b711326165ec
tree6d011148b6e2f8ac9b40b63675c03d0fa33dfdb0
parent57718ea6f70d5fcea8bf9b29ac71a6c7aeb8738a
parent9b22e5b4e80e9daadf2af6430607016839e1909c
Merge "Add resetKeyStore() in LockSettingsService" into nyc-dev am: 1cb6f9d8a4
am: 9b22e5b4e8

* commit '9b22e5b4e80e9daadf2af6430607016839e1909c':
  Add resetKeyStore() in LockSettingsService

Change-Id: Icf0caad400e9ab8fd04af6e79f049db406dce4a7