| commit | 2ab1c09ba87b34db59346e6bdac8d484e30d6a2c | [log] [tgz] |
|---|---|---|
| author | Craig Mautner <cmautner@google.com> | Sat Mar 08 11:01:59 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Mar 08 11:01:59 2014 +0000 |
| tree | 00888f18d44e2979ed306ec884d250e83f54a465 | |
| parent | 2d3ddc2ba9f86d795e437ea90dccb59cf1ebfd11 [diff] | |
| parent | 889f705df342c3ecd54d5e14f9cd581c625bc438 [diff] |
am 889f705d: (-s ours) am f8c4c3c7: am 508e88e3: am 9bf7f893: (-s ours) am 93df07a1: Merge "Show the keyguard if unsecure window on top. DO NOT MERGE." into klp-dev * commit '889f705df342c3ecd54d5e14f9cd581c625bc438': Show the keyguard if unsecure window on top. DO NOT MERGE.