commit | 7442acf25baad47daea15569a2b85ffb22422bfc | [log] [tgz] |
---|---|---|
author | Craig Mautner <cmautner@google.com> | Fri Mar 07 01:27:53 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Mar 07 01:27:53 2014 +0000 |
tree | 007c8a4f3c2131104018a031c0e237f617164045 | |
parent | d7b5caabfec09a617ebbdec3d566f0be061f516c [diff] | |
parent | f453f3a1685b14047533429aff15fd2e2ba3d7c9 [diff] |
am f453f3a1: Merge "Show the keyguard if unsecure window on top" into klp-modular-dev * commit 'f453f3a1685b14047533429aff15fd2e2ba3d7c9': Show the keyguard if unsecure window on top