tree 7e53b65f1c1d5fd1c51ba617231465a284a59fe6
parent 4a24b57f0e25286eb04c86461d80dcf2bda56950
parent 77ee6507962576e8ddc41ee0209158a799e79519
author TreeHugger Robot <treehugger-gerrit@google.com> 1517017625 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1517017625 +0000

Merge "Delay coming out of doze until keyguard dismissed"