Ricky Wai f7a58e292c Merge "Merge "Add resetKeyStore() in LockSettingsService" into nyc-dev am: 1cb6f9d8a4 am: 754ddca748" into nyc-mr1-dev-plus-aosp ...

am: 1db5fc9810

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

Change-Id: Ia3a5c7156fd7774bffa8e4b5ad4d81b36e408923

2016-05-26 14:51:20 +00:00

..

android

Merge "Merge "Add resetKeyStore() in LockSettingsService" into nyc-dev am: 1cb6f9d8a4 am: 754ddca748" into nyc-mr1-dev-plus-aosp

2016-05-26 14:51:20 +00:00

google/android

…