Merge "[WifiSettings] Add progress bar when scanning" into mnc-dev

author Maurice Lam <yukl@google.com>

Thu, 30 Apr 2015 17:53:19 +0000 (17:53 +0000)

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

Thu, 30 Apr 2015 17:53:20 +0000 (17:53 +0000)
author Maurice Lam <yukl@google.com>
Thu, 30 Apr 2015 17:53:19 +0000 (17:53 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Thu, 30 Apr 2015 17:53:20 +0000 (17:53 +0000)
diff --cc src/com/android/settings/wifi/WifiSettings.java
Simple merge
author	Maurice Lam <yukl@google.com>
	Thu, 30 Apr 2015 17:53:19 +0000 (17:53 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Thu, 30 Apr 2015 17:53:20 +0000 (17:53 +0000)