tree 668d7d0ca31f28f267ffe1331157b56996911e6e
parent 544b67a04b4289aaafa852cbab54abf1f3d6a5bf
parent 2f9a44101f4fd372834c67150aea76a07b94b5ec
author Andreas Huber <andih@google.com> 1346281882 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1346281882 -0700

am 2f9a4410: Merge "Fix wifi display shutdown deadlock." into jb-mr1-dev

* commit '2f9a44101f4fd372834c67150aea76a07b94b5ec':
  Fix wifi display shutdown deadlock.