tree 1ccdc06b1f3e6a0dea8bc9b5510565e8ef6707e8
parent 5d958998811d6e291e2eff86033083548b47ac2c
parent db44cb92ecae78f0fa5a8fe60eb1d35393c67507
author Chong Zhang <chz@google.com> 1384986840 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1384986840 -0800

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

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