tree 1620d9caa2b550f87c40d7a46a3a7909ef93c578
parent 33384ed696927efac8d3c495d5446e0f0bd73995
parent 7710199376657415e5341f64a830aa50fcb117aa
author Dianne Hackborn <hackbod@google.com> 1351640394 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1351640394 -0700

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.