| commit | a9a3e24835b08828aa252bf079067a5f810a0792 | [log] [tgz] |
|---|---|---|
| author | Jim Miller <jaggies@google.com> | Mon Nov 17 19:53:46 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Nov 17 19:53:46 2014 +0000 |
| tree | 73337705ef838ecbaf60c07d48fa55b38a143d97 | |
| parent | b723931b88f9e30db47c2776db2474e0b2f71ca1 [diff] | |
| parent | 58b9ee28262a608853dbb1134b5a79cf7fdce502 [diff] |
am 58b9ee28: am cd75f59f: Merge "Fix deadlock caused by synchronous setOccluded() method in keyguard" into lmp-mr1-dev * commit '58b9ee28262a608853dbb1134b5a79cf7fdce502': Fix deadlock caused by synchronous setOccluded() method in keyguard