tree 4ca0252463f53b1058a47eb571ded7c8c7a0c57c
parent dda4a8e17b0f33cb1df77da85487ce73f6995766
parent 7f50956f8af785568f492259e5f670592b3305be
author TreeHugger Robot <treehugger-gerrit@google.com> 1517327109 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1517327109 +0000

Merge "Revert "Delay coming out of doze until keyguard dismissed""