tree 88f22438e935d1f52cb65e93b35fd1f589f6c44b
parent 8b46195929bd2709fcee94fba52540ac784f9436
parent 657b301f84652d49bc7a6e77cc906fe758a070de
author Craig Mautner <cmautner@google.com> 1410500834 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1410500834 +0000

am a7027783: am 31632435: Merge changes Ia6fe9724,I682b9acb into lmp-dev

* commit 'a7027783e39e4da9ef6cc66a200746ffb81e720e':
  Show all windows from activity that hides keyguard
  Make sure FLAG_DISMISS_KEYGUARD brings up bouncer