tree aa95dee27bc816ab3090a0e051971f19394fee04
parent ed95cabf4cd13febec213ad342d947c7c847180c
parent bfdecccc48ef2fd9bfb19d77be2492f22971fed9
author Chong Zhang <chz@google.com> 1384986464 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1384986464 -0800

am bfdecccc: Merge "Only scan for wifi display when there is no active connections" into klp-dev

* commit 'bfdecccc48ef2fd9bfb19d77be2492f22971fed9':
  Only scan for wifi display when there is no active connections