tree ec2db2b4a51d0f39bf08acd0ebe1229e7bfcb0e9
parent 198c9b9be771a5b6f0bc1d5590eef1f0cd5dd08c
parent e891a7888141fcd3e7956bf80425c885992fa2bf
author Andreas Huber <andih@google.com> 1347472521 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1347472521 -0700

am e891a788: Merge "Various improvements to the wifi display implementation." into jb-mr1-dev

* commit 'e891a7888141fcd3e7956bf80425c885992fa2bf':
  Various improvements to the wifi display implementation.