| commit | f6f0946addc5230634ac2a09115097531dc6094b | [log] [tgz] |
|---|---|---|
| author | Craig Mautner <cmautner@google.com> | Fri Mar 14 21:54:52 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Mar 14 21:54:52 2014 +0000 |
| tree | 0192ecdd90ec9b615ecccf418f17b5f3d2e5dc84 | |
| parent | 77943308f5661636d85cb5e78188dbbc8f0e329e [diff] | |
| parent | 00c7d34c463e9c3b4b6d5aca1e62b8caeb3fd7b2 [diff] |
am 00c7d34c: am ff89d589: Merge commit \'3b9de0a4\' into manualmerge * commit '00c7d34c463e9c3b4b6d5aca1e62b8caeb3fd7b2': Show the keyguard if unsecure window on top