commit | 1cb6f9d8a4827d50e26bf83068a928e47c5c1f1e | [log] [tgz] |
---|---|---|
author | Ricky Wai <rickywai@google.com> | Thu May 26 13:46:25 2016 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Thu May 26 13:46:26 2016 +0000 |
tree | e83dfd353da858e6b32658c19a650368b087fa9d | |
parent | 610fb8a3f2dcdc66dbc4e31d92a08cc249b5ca7b [diff] | |
parent | 4613fe41ac9e817e76d7087de45bf01f4a6584d6 [diff] |
Merge "Add resetKeyStore() in LockSettingsService" into nyc-dev