diff options
| author | Fred Quintana <fredq@google.com> | 2009-11-05 14:12:16 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-11-05 14:12:16 -0800 |
| commit | 12a8a59e7af41b61f628040c3fa64c8faa290246 (patch) | |
| tree | 5e325fe449d82181b30c0f620ebd1f1a145d171d /packages/SubscribedFeedsProvider/res/values-it/strings.xml | |
| parent | 9e50993c844faaac8c49c4da209a0a14807c4c6c (diff) | |
| parent | 0fb041f364355c438eb7d508eb7fa7946418cd11 (diff) | |
| download | frameworks_base-12a8a59e7af41b61f628040c3fa64c8faa290246.zip frameworks_base-12a8a59e7af41b61f628040c3fa64c8faa290246.tar.gz frameworks_base-12a8a59e7af41b61f628040c3fa64c8faa290246.tar.bz2 | |
am 0fb041f3: am 3266c5f1: resolved conflicts for merge of f476c480 to eclair-mr2
Merge commit '0fb041f364355c438eb7d508eb7fa7946418cd11'
* commit '0fb041f364355c438eb7d508eb7fa7946418cd11':
remove the SubscribedFeedsProvider since it has been moved to vendor/google
Diffstat (limited to 'packages/SubscribedFeedsProvider/res/values-it/strings.xml')
| -rw-r--r-- | packages/SubscribedFeedsProvider/res/values-it/strings.xml | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/packages/SubscribedFeedsProvider/res/values-it/strings.xml b/packages/SubscribedFeedsProvider/res/values-it/strings.xml deleted file mode 100644 index 2a6dd54..0000000 --- a/packages/SubscribedFeedsProvider/res/values-it/strings.xml +++ /dev/null @@ -1,20 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- Copyright (C) 2009 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 xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="app_label" msgid="5400580392303600842">"Sincronizzazione feed"</string> - <string name="provider_label" msgid="3669714991966737047">"Sottoscrizioni push"</string> -</resources> |