tree f0bccd341ce87b033afd71699a827c76d93b42c8
parent b6c3d5b4ac9300fdb2902509ff485feadcae9553
parent 6b0653ffadea757c87724594b70922cd11dcd835
author Chong Zhang <chz@google.com> 1384986611 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1384986611 -0800

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

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