commit | 8c9606914d4295e325bb387eea0ca2b24ee7587f | [log] [tgz] |
---|---|---|
author | Craig Mautner <cmautner@google.com> | Sat Mar 08 06:23:41 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Sat Mar 08 06:23:41 2014 +0000 |
tree | 7be14bfb97161df5c556a3439a85b1e6ec069027 | |
parent | efae1ff25d51d3c7ff2def472e8eb0c56b1be33f [diff] | |
parent | 9bf7f893e0833fca9b240c11b98d6d7dc1892081 [diff] |
am 9bf7f893: 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.