| commit | e45f1cc3a78656203454a54c496556114fcedbf2 | [log] [tgz] |
|---|---|---|
| author | Jim Miller <jaggies@google.com> | Mon Nov 17 20:27:26 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Nov 17 20:27:26 2014 +0000 |
| tree | 79a6839648e2c07f8c70c8fd63cb094da6863ba4 | |
| parent | 557cb438867ed9ebc9766ce081e0ff3b4087c1ab [diff] | |
| parent | a9a3e24835b08828aa252bf079067a5f810a0792 [diff] |
am a9a3e248: am 58b9ee28: am cd75f59f: Merge "Fix deadlock caused by synchronous setOccluded() method in keyguard" into lmp-mr1-dev * commit 'a9a3e24835b08828aa252bf079067a5f810a0792': Fix deadlock caused by synchronous setOccluded() method in keyguard