| commit | 1db5fc9810c412aafcfe430285943c6797e8e3fc | [log] [tgz] |
|---|---|---|
| author | Android Build Merger (Role) <android-build-merger@google.com> | Thu May 26 14:37:12 2016 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu May 26 14:37:14 2016 +0000 |
| tree | 6d011148b6e2f8ac9b40b63675c03d0fa33dfdb0 | |
| parent | 26bbadc484f094a9e89f59ad946d74d4b4f8aa82 [diff] | |
| parent | e1855ce4925c2c3ebe8cba019be447eac94af7ad [diff] |
Merge "Merge "Add resetKeyStore() in LockSettingsService" into nyc-dev am: 1cb6f9d8a4 am: 754ddca748" into nyc-mr1-dev-plus-aosp