tree a42f88946cb32668df3816ceaecc062a01a5f2af
parent d147203bc43926caddf953732682fc384ab597cb
parent bf17375e5e6195122ee24295cf05f012822711ec
author Olawale Ogunwale <ogunwale@google.com> 1433172892 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1433172892 +0000

am bf17375e: Merge "Should reset mDismissKeyguard on keyguard secure change"

* commit 'bf17375e5e6195122ee24295cf05f012822711ec':
  Should reset mDismissKeyguard on keyguard secure change