| commit | d3143333415bb7739ea753531ba0eec754653030 | [log] [tgz] |
|---|---|---|
| author | Tim Kilbourn <tkilbourn@google.com> | Fri Dec 12 18:57:25 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Dec 12 18:57:25 2014 +0000 |
| tree | 2e085303dd7f97860f94d6a7451b87f05d0f8788 | |
| parent | 097e3830cd33d1848da3f61a16866f2bbcb3b6d0 [diff] | |
| parent | d91985cd4306ad3d9f422a7392bc8513f6c59e07 [diff] |
am d91985cd: am 2636ccc1: Merge "Revert "Attempt to fix keyguard missing bug"" into lmp-mr1-dev * commit 'd91985cd4306ad3d9f422a7392bc8513f6c59e07': Revert "Attempt to fix keyguard missing bug"