OSDN Git Service

Merge "Show the keyguard if unsecure window on top. DO NOT MERGE." into klp-dev
authorCraig Mautner <cmautner@google.com>
Fri, 7 Mar 2014 22:30:25 +0000 (22:30 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 7 Mar 2014 22:30:26 +0000 (22:30 +0000)
commit93df07a1b72488b64354098cd00dff1d36b76b12
tree98338c08e7eb3b446983848cacd46e7c5779ced1
parent9823a170e4f9ff1d9233eb7eb661c4d418c2e2a7
parent2c82c08a5422de757491eec9c3a2347bb4fb4dd0
Merge "Show the keyguard if unsecure window on top. DO NOT MERGE." into klp-dev
policy/src/com/android/internal/policy/impl/PhoneWindowManager.java