Merge "WifiConfiguration: Remove dead commented code" into nyc-dev

author Paul Stewart <pstew@google.com>

Fri, 25 Mar 2016 03:42:09 +0000 (03:42 +0000)

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

Fri, 25 Mar 2016 03:42:10 +0000 (03:42 +0000)
author Paul Stewart <pstew@google.com>
Fri, 25 Mar 2016 03:42:09 +0000 (03:42 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Fri, 25 Mar 2016 03:42:10 +0000 (03:42 +0000)
diff --cc wifi/java/android/net/wifi/WifiConfiguration.java
Simple merge
author	Paul Stewart <pstew@google.com>
	Fri, 25 Mar 2016 03:42:09 +0000 (03:42 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Fri, 25 Mar 2016 03:42:10 +0000 (03:42 +0000)