Merge "Fix bug #12890909 Settings crashes when tapped on Add Account option in settings"

        </activity>

        <activity android:name=".accounts.SyncSettingsActivity"

            android:label="@string/account_sync_settings_title"

            android:theme="@android:style/Theme.Holo.Dialog">

            android:label="@string/account_sync_settings_title">

            <intent-filter>

                <action android:name="android.intent.action.MAIN" />

                <action android:name="android.settings.SYNC_SETTINGS" />