tree 0f11fe0b48f0aac401c256e597014b44e3f5db4f
parent 606bd052ed1f04fe080efe84bd9bf8ca5e8f2386
parent 8caba37c8edc01cdc5810e2749ae02484cebe486
author Ricky Wai <rickywai@google.com> 1462359337 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1462359338 +0000

Merge "Do not run dpm.resetPassword() in keyguard disabled test" into nyc-dev