am 69a50431: Merge changes Ie232b2d4,I81b6bf3f into klp-dev

* commit '69a5043130ae0bb01d7b2608aac340b7abc0c590':
  Add resources for light theme
  Support Holo Light theme for wifi during setup

AndroidManifest.xml

@@ -171,7 +171,7 @@
 
         <activity android:name=".wifi.WifiSetupActivity"
                 android:uiOptions="splitActionBarWhenNarrow"
-                android:theme="@style/setup_wizard_theme"
+                android:theme="@style/SetupWizardWifiTheme"
                 android:label="@string/wifi_setup_wizard_title"
                 android:icon="@drawable/empty_icon"
                 android:clearTaskOnLaunch="true">