tree 17bb9c6fc9b033e20594ec6e6d8d76cec95436ce
parent 43bfed5430f8c0b042ad229370a9d1fe95eb6156
parent 5df673d915ef9c9d4466ff1a7eeaf62f908c7aff
author Craig Mautner <cmautner@google.com> 1394834586 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1394834586 +0000

am 5df673d9: am f6f0946a: am 00c7d34c: am ff89d589: Merge commit \'3b9de0a4\' into manualmerge

* commit '5df673d915ef9c9d4466ff1a7eeaf62f908c7aff':
  Show the keyguard if unsecure window on top