OSDN Git Service

Merge "Add resetKeyStore() in LockSettingsService" into nyc-dev
authorRicky Wai <rickywai@google.com>
Thu, 26 May 2016 14:03:51 +0000 (14:03 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 26 May 2016 14:03:51 +0000 (14:03 +0000)
commit754ddca748d7a8d3e55f4d90c07ca140a7ed312d
treedb744c358509ca6767855d489e9739cab42000c6
parent7c46f928f4ef3998f16084cb5eeb732c0d2b21e7
parent1cb6f9d8a4827d50e26bf83068a928e47c5c1f1e
Merge "Add resetKeyStore() in LockSettingsService" into nyc-dev
am: 1cb6f9d8a4

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

Change-Id: I6af43eb9f472c1d5a1f9356a9b618a183200e38e