| commit | 9b22e5b4e80e9daadf2af6430607016839e1909c | [log] [tgz] |
|---|---|---|
| author | Ricky Wai <rickywai@google.com> | Thu May 26 14:03:51 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu May 26 14:03:51 2016 +0000 |
| tree | 5d1ab076a603a3c32ef3edee03981e379919ed76 | |
| parent | 56181175a7717dc1d8ea58cdd2ecdcb252119304 [diff] | |
| parent | 1cb6f9d8a4827d50e26bf83068a928e47c5c1f1e [diff] |
Merge "Add resetKeyStore() in LockSettingsService" into nyc-dev am: 1cb6f9d8a4 * commit '1cb6f9d8a4827d50e26bf83068a928e47c5c1f1e': Add resetKeyStore() in LockSettingsService Change-Id: I0125a334fac098183e68fa0b9cd24bda64a88fae