OSDN Git Service

Merge "Should reset mDismissKeyguard on keyguard secure change" into mnc-dev
authorOlawale Ogunwale <ogunwale@google.com>
Tue, 2 Jun 2015 17:51:15 +0000 (17:51 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 2 Jun 2015 17:51:22 +0000 (17:51 +0000)
commit5b9b66c73c80697c1d3694a2d4ee975e409bd89d
tree3ee8bae60e7beb11479273f1c6ad3ea3b5c9f7f5
parentcdc7bf10dd19d1fa233d51ba46151310f4e0fd3f
parente785ffa059dcb3bcff242ae4c89cdb43b081dcb2
Merge "Should reset mDismissKeyguard on keyguard secure change" into mnc-dev
services/core/java/com/android/server/policy/PhoneWindowManager.java