tree f167d7577253b6c91cbc53d60aca4870faf74de2
parent fea14ab0bc8d117ed748bdfda5cbfacd1920538e
parent 91e873a9cfef37f2dce69b33f90ca7c09c0112db
author Andreas Huber <andih@google.com> 1348855562 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1348855562 -0700

am e646b2d2: Merge "Various improvements to a cleaner shutdown of the wifi display connection." into jb-mr1-dev

* commit 'e646b2d26459ca30667097e9600ee3f57ebfd228':
  Various improvements to a cleaner shutdown of the wifi display connection.