diff options
author | Jim Miller <jaggies@google.com> | 2014-11-17 19:53:46 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-17 19:53:46 +0000 |
commit | a9a3e24835b08828aa252bf079067a5f810a0792 (patch) | |
tree | 73337705ef838ecbaf60c07d48fa55b38a143d97 /include | |
parent | b723931b88f9e30db47c2776db2474e0b2f71ca1 (diff) | |
parent | 58b9ee28262a608853dbb1134b5a79cf7fdce502 (diff) | |
download | frameworks_base-a9a3e24835b08828aa252bf079067a5f810a0792.zip frameworks_base-a9a3e24835b08828aa252bf079067a5f810a0792.tar.gz frameworks_base-a9a3e24835b08828aa252bf079067a5f810a0792.tar.bz2 |
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
Diffstat (limited to 'include')
0 files changed, 0 insertions, 0 deletions