| commit | 44ee0fb144947206713e6527a5227fd44e2d4e1e | [log] [tgz] |
|---|---|---|
| author | Jim Miller <jaggies@google.com> | Fri Nov 08 11:01:57 2013 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Nov 08 11:01:57 2013 -0800 |
| tree | a82ee2eb07170e8570cb2128a3ba3212c7f29c2c | |
| parent | ca39478f33977ba6ba278fb9e3913144d7a5d0c2 [diff] | |
| parent | c55edb266f96364277b4a3552295c94363d847fb [diff] |
am c55edb26: Merge changes I74bfc0d5,I577f9d36 into klp-dev * commit 'c55edb266f96364277b4a3552295c94363d847fb': Delay tearing down external displays until keyguard finishes Show keyguard scrim on external displays while keyguard showing