Merge "Make captive portal login app not restart upon device rotation." into nyc-dev

        <activity

            android:name="com.android.captiveportallogin.CaptivePortalLoginActivity"

            android:label="@string/action_bar_label"

            android:theme="@style/AppTheme" >

            android:theme="@style/AppTheme"

            android:configChanges="keyboardHidden|orientation|screenSize" >

            <intent-filter>

                <action android:name="android.net.conn.CAPTIVE_PORTAL"/>

                <category android:name="android.intent.category.DEFAULT"/>