| commit | ed1cfc45b19b5e06ac0a6074363805c51ecafced | [log] [tgz] |
|---|---|---|
| author | Jim Miller <jaggies@google.com> | Fri Nov 08 11:38:12 2013 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Nov 08 11:38:12 2013 -0800 |
| tree | 745bd347a0ade93c849ad7dd0c6669774a975aea | |
| parent | 776eacc2b9f7c9ce04aef68363d4cd60ac9921c0 [diff] | |
| parent | c9fd186b4692e2da63698f15be59abcd360e321c [diff] |
am c9fd186b: am 44ee0fb1: am c55edb26: Merge changes I74bfc0d5,I577f9d36 into klp-dev * commit 'c9fd186b4692e2da63698f15be59abcd360e321c': Delay tearing down external displays until keyguard finishes Show keyguard scrim on external displays while keyguard showing