tree 08be52148286433fe612a8559ea6744878e9b955
parent 6307647e2493e19673f733fdc471e6150df43f72
parent 32a3bf35210bf4d46d1cf33d63434df1eda1ab6a
author TreeHugger Robot <treehugger-gerrit@google.com> 1504263585 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1504263585 +0000

Merge "Update DPM.setKeyguardDisabled to also dismiss the keyguard"