| commit | 776f67b81724314820b04fefeb83683d702c563c | [log] [tgz] |
|---|---|---|
| author | Andreas Huber <andih@google.com> | Wed Aug 29 16:13:31 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Aug 29 16:13:31 2012 -0700 |
| tree | c33abaa3b932e2961b9af3252523e33dee41a304 | |
| parent | 138dcf919303e0d47b2f5e5ce9e3e8b08eb83c42 [diff] | |
| parent | d58522bbd87cd09c8e7953a992a3b97f6ca7f30f [diff] |
am d58522bb: am 2f9a4410: Merge "Fix wifi display shutdown deadlock." into jb-mr1-dev * commit 'd58522bbd87cd09c8e7953a992a3b97f6ca7f30f': Fix wifi display shutdown deadlock.