OSDN Git Service

am e1f58785: (-s ours) am bf17375e: Merge "Should reset mDismissKeyguard on keyguard...
authorOlawale Ogunwale <ogunwale@google.com>
Mon, 1 Jun 2015 16:02:38 +0000 (16:02 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 1 Jun 2015 16:02:38 +0000 (16:02 +0000)
commita25764595c088c68cf8f90eabcf3066d874925f8
tree833ebd668375c40fe5e66b627a3d7dcc9edad404
parent995846a4310ef4270177bf9d6c6673827b5625af
parente1f587859a2e41e309a93d2de604753bdbb14dca
am e1f58785: (-s ours) am bf17375e: Merge "Should reset mDismissKeyguard on keyguard secure change"

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