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