| commit | 00c7d34c463e9c3b4b6d5aca1e62b8caeb3fd7b2 | [log] [tgz] |
|---|---|---|
| author | Craig Mautner <cmautner@google.com> | Fri Mar 14 08:47:54 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Mar 14 08:47:54 2014 +0000 |
| tree | 16059bde0c679ecba9a573ccd039ec8a5452acee | |
| parent | fd2f8d43419d1f25ced8b2bac96407925dd4c471 [diff] | |
| parent | ff89d589c7eb32265bf70068ffaef24104a580a5 [diff] |
am ff89d589: Merge commit \'3b9de0a4\' into manualmerge * commit 'ff89d589c7eb32265bf70068ffaef24104a580a5': Show the keyguard if unsecure window on top