Merge "Prevent scanning during DHCP process"

author Irfan Sheriff <isheriff@android.com>

Wed, 5 Dec 2012 17:25:43 +0000 (09:25 -0800)

committer Gerrit Code Review <noreply-gerritcodereview@google.com>

Wed, 5 Dec 2012 17:25:43 +0000 (09:25 -0800)
author Irfan Sheriff <isheriff@android.com>
Wed, 5 Dec 2012 17:25:43 +0000 (09:25 -0800)
committer Gerrit Code Review <noreply-gerritcodereview@google.com>
Wed, 5 Dec 2012 17:25:43 +0000 (09:25 -0800)
diff --cc wifi/java/android/net/wifi/WifiStateMachine.java
Simple merge
author	Irfan Sheriff <isheriff@android.com>
	Wed, 5 Dec 2012 17:25:43 +0000 (09:25 -0800)
committer	Gerrit Code Review <noreply-gerritcodereview@google.com>
	Wed, 5 Dec 2012 17:25:43 +0000 (09:25 -0800)