tree d37ba95b9adc3370943383c52ce14f50aa3924b8
parent 2e582d1379fa78e2693269d76d2bcd763bfbfba1
parent 20a4f490957407b9534fc453833de2fe2f276426
author Craig Mautner <cmautner@google.com> 1394733673 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1394733673 -0700

am 20a4f490: am 817f5586: am 3d958f81: am 468e8e98: am 1f52437d: Show the keyguard if unsecure window on top

* commit '20a4f490957407b9534fc453833de2fe2f276426':
  Show the keyguard if unsecure window on top