Merge "Wifi select screen redlines" into jb-dev

author Russell Brenner <russellbrenner@google.com>

Thu, 17 May 2012 19:49:15 +0000 (12:49 -0700)

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

Thu, 17 May 2012 19:49:15 +0000 (12:49 -0700)
author Russell Brenner <russellbrenner@google.com>
Thu, 17 May 2012 19:49:15 +0000 (12:49 -0700)
committer Android (Google) Code Review <android-gerrit@google.com>
Thu, 17 May 2012 19:49:15 +0000 (12:49 -0700)
diff --cc src/com/android/settings/wifi/WifiSettings.java
Simple merge
author	Russell Brenner <russellbrenner@google.com>
	Thu, 17 May 2012 19:49:15 +0000 (12:49 -0700)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Thu, 17 May 2012 19:49:15 +0000 (12:49 -0700)