OSDN Git Service

am ff89d589: Merge commit \'3b9de0a4\' into manualmerge
authorCraig Mautner <cmautner@google.com>
Fri, 14 Mar 2014 08:47:54 +0000 (08:47 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 14 Mar 2014 08:47:54 +0000 (08:47 +0000)
commit00c7d34c463e9c3b4b6d5aca1e62b8caeb3fd7b2
tree16059bde0c679ecba9a573ccd039ec8a5452acee
parentfd2f8d43419d1f25ced8b2bac96407925dd4c471
parentff89d589c7eb32265bf70068ffaef24104a580a5
am ff89d589: Merge commit \'3b9de0a4\' into manualmerge

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