OSDN Git Service

am 468e8e98: am 1f52437d: Show the keyguard if unsecure window on top
authorCraig Mautner <cmautner@google.com>
Thu, 13 Mar 2014 17:51:39 +0000 (10:51 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 13 Mar 2014 17:51:39 +0000 (10:51 -0700)
* commit '468e8e9873d764c090576d70aebf658e3e89bbfe':
  Show the keyguard if unsecure window on top


Trivial merge