| commit | 889f705df342c3ecd54d5e14f9cd581c625bc438 | [log] [tgz] |
|---|---|---|
| author | Craig Mautner <cmautner@google.com> | Sat Mar 08 02:09:30 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Mar 08 02:09:30 2014 +0000 |
| tree | 635bb233b6112771b3a78d2f595e3bc1b5b52182 | |
| parent | 199670c46a9950bd2e06af43ea082427b542060a [diff] | |
| parent | f8c4c3c765ca5d4faa4aed6940e5a26c9c7f1d44 [diff] |
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 'f8c4c3c765ca5d4faa4aed6940e5a26c9c7f1d44': Show the keyguard if unsecure window on top. DO NOT MERGE.