| commit | 508e88e329cd157c3de94ccbac7374038f7e2355 | [log] [tgz] |
|---|---|---|
| author | Craig Mautner <cmautner@google.com> | Sat Mar 08 01:55:33 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Mar 08 01:55:33 2014 +0000 |
| tree | 5bfa7c7379d56fa6ae93c5f54ffe8643b6112f43 | |
| parent | b559b37150d24411f0b5ef102ced8d5acf858a0e [diff] | |
| parent | 9bf7f893e0833fca9b240c11b98d6d7dc1892081 [diff] |
am 9bf7f893: (-s ours) am 93df07a1: Merge "Show the keyguard if unsecure window on top. DO NOT MERGE." into klp-dev * commit '9bf7f893e0833fca9b240c11b98d6d7dc1892081': Show the keyguard if unsecure window on top. DO NOT MERGE.