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