OSDN Git Service

am 00c7d34c: am ff89d589: Merge commit \'3b9de0a4\' into manualmerge
authorCraig Mautner <cmautner@google.com>
Fri, 14 Mar 2014 21:54:52 +0000 (21:54 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 14 Mar 2014 21:54:52 +0000 (21:54 +0000)
commitf6f0946addc5230634ac2a09115097531dc6094b
tree0192ecdd90ec9b615ecccf418f17b5f3d2e5dc84
parent77943308f5661636d85cb5e78188dbbc8f0e329e
parent00c7d34c463e9c3b4b6d5aca1e62b8caeb3fd7b2
am 00c7d34c: am ff89d589: Merge commit \'3b9de0a4\' into manualmerge

* commit '00c7d34c463e9c3b4b6d5aca1e62b8caeb3fd7b2':
  Show the keyguard if unsecure window on top
policy/src/com/android/internal/policy/impl/PhoneWindowManager.java