tree dcfc7fe7ec9128fa2282e4717ffadab2e56895fa
parent 08500d5741ae5b21a397957cfb441787f0224d77
parent c602187e51aa6e8c46bffa5fb2603e368d83ea95
author Irfan Sheriff <isheriff@android.com> 1354819144 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1354819144 -0800

am c602187e: Merge "Prevent scanning during DHCP process"

* commit 'c602187e51aa6e8c46bffa5fb2603e368d83ea95':
  Prevent scanning during DHCP process