Merge "Fix EAP-TLS reconnect after reboot issue" into klp-dev

author Vinit Deshapnde <vinitd@google.com>

Thu, 3 Oct 2013 21:19:52 +0000 (21:19 +0000)

committer Android (Google) Code Review <android-gerrit@google.com>

Thu, 3 Oct 2013 21:19:52 +0000 (21:19 +0000)
author Vinit Deshapnde <vinitd@google.com>
Thu, 3 Oct 2013 21:19:52 +0000 (21:19 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Thu, 3 Oct 2013 21:19:52 +0000 (21:19 +0000)
diff --cc wifi/java/android/net/wifi/WifiStateMachine.java
Simple merge
author	Vinit Deshapnde <vinitd@google.com>
	Thu, 3 Oct 2013 21:19:52 +0000 (21:19 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Thu, 3 Oct 2013 21:19:52 +0000 (21:19 +0000)