| commit | 713cd791a906d37e8b772f53b1b7cd842395d5ac | [log] [tgz] |
|---|---|---|
| author | Craig Mautner <cmautner@google.com> | Fri Mar 14 19:00:20 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Mar 14 19:00:20 2014 +0000 |
| tree | f553317917d756504f1ddd6fbe03a7431a11c42d | |
| parent | daf27b85f1877c5a802abe7362a0490f89c25ae5 [diff] | |
| parent | 00c7d34c463e9c3b4b6d5aca1e62b8caeb3fd7b2 [diff] |
am 00c7d34c: am ff89d589: Merge commit \'3b9de0a4\' into manualmerge * commit '00c7d34c463e9c3b4b6d5aca1e62b8caeb3fd7b2': Show the keyguard if unsecure window on top