OSDN Git Service

am 77101993: Merge "Bring up unlock screen for FLAG_DISMISS_KEYGUARD." into jb-mr1-dev
authorDianne Hackborn <hackbod@google.com>
Tue, 30 Oct 2012 23:39:54 +0000 (16:39 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 30 Oct 2012 23:39:54 +0000 (16:39 -0700)
commita56395da5df55cf030f20c5cfdc23e3a540540ab
tree1620d9caa2b550f87c40d7a46a3a7909ef93c578
parent33384ed696927efac8d3c495d5446e0f0bd73995
parent7710199376657415e5341f64a830aa50fcb117aa
am 77101993: Merge "Bring up unlock screen for FLAG_DISMISS_KEYGUARD." into jb-mr1-dev

* commit '7710199376657415e5341f64a830aa50fcb117aa':
  Bring up unlock screen for FLAG_DISMISS_KEYGUARD.
policy/src/com/android/internal/policy/impl/keyguard/KeyguardHostView.java