Merge change 6705 into donut

* changes:
  Add translated time zone picker lists for several more languages.
diff --git a/src/com/android/settings/wifi/WifiLayer.java b/src/com/android/settings/wifi/WifiLayer.java
index 751a5a3..f275237 100644
--- a/src/com/android/settings/wifi/WifiLayer.java
+++ b/src/com/android/settings/wifi/WifiLayer.java
@@ -501,7 +501,7 @@
         
         if (!mWifiManager.isWifiEnabled()) return;
         
-        if (!mWifiManager.startScan()) {
+        if (!mWifiManager.startScanActive()) {
             postAttemptScan();
         } else {
             mScanRetryCount = 0;