commit | 1fb972cc3168302271107bfdcace40e57a9da8ca | [log] [tgz] |
---|---|---|
author | Ricky Wai <rickywai@google.com> | Wed May 04 10:55:37 2016 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Wed May 04 10:55:38 2016 +0000 |
tree | 0f11fe0b48f0aac401c256e597014b44e3f5db4f | |
parent | 606bd052ed1f04fe080efe84bd9bf8ca5e8f2386 [diff] | |
parent | 8caba37c8edc01cdc5810e2749ae02484cebe486 [diff] |
Merge "Do not run dpm.resetPassword() in keyguard disabled test" into nyc-dev