Merge change 4411 into donut

        android:sharedUserId="android.uid.system">

    <application android:allowClearUserData="false"

                 android:label="Settings Storage"

                 android:label="@string/app_label"

                 android:icon="@drawable/ic_launcher_settings">

        <provider android:name="SettingsProvider" android:authorities="settings"

<?xml version="1.0" encoding="utf-8"?>

<!--

/**

 * Copyright (c) 2007, The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License"); 

 * you may not use this file except in compliance with the License. 

 * You may obtain a copy of the License at 

 *

 *     http://www.apache.org/licenses/LICENSE-2.0 

 *

 * Unless required by applicable law or agreed to in writing, software 

 * distributed under the License is distributed on an "AS IS" BASIS, 

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 

 * See the License for the specific language governing permissions and 

 * limitations under the License.

 */

-->

<resources>

    <!-- Name of the activity for Settings storage. -->

    <string name="app_label">Settings Storage</string>

</resources>

    <application android:process="system"

                 android:allowClearUserData="false"

                 android:icon="@drawable/app_icon"

                 android:label="Sync Feeds">

                 android:label="@string/app_label">

        <uses-library android:name="com.google.android.gtalkservice" />

        <provider android:name="SubscribedFeedsProvider"

                android:authorities="subscribedfeeds" android:syncable="false"

<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2008 The Android Open Source Project

     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

     You may obtain a copy of the License at

          http://www.apache.org/licenses/LICENSE-2.0

     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     See the License for the specific language governing permissions and

     limitations under the License.

-->

<resources>

    <!-- Title of the feed synchronization activity. -->

    <string name="app_label">Sync Feeds</string>

</resources>

        package="com.android.server.vpn"

        android:sharedUserId="android.uid.system"

        >

    <application android:label="VPN Services">

    <application android:label="@string/app_label">

        <service android:name=".VpnServiceBinder" android:process=":remote">

            <intent-filter>