diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-06-16 08:36:48 -0700 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2009-06-16 08:36:48 -0700 |
| commit | 3c3d3081aad5d3a0cadd18c7764974060c1a5274 (patch) | |
| tree | 4bd057b73a62d2cbd20e6264cdabb8920605cb1e /packages/SettingsProvider | |
| parent | 29930a1cb884885f92c72a76e42e795ac948edc3 (diff) | |
| parent | 727f36c6a1c70ba5519ec9ce2da9ab1cf303a2ef (diff) | |
| download | frameworks_base-3c3d3081aad5d3a0cadd18c7764974060c1a5274.zip frameworks_base-3c3d3081aad5d3a0cadd18c7764974060c1a5274.tar.gz frameworks_base-3c3d3081aad5d3a0cadd18c7764974060c1a5274.tar.bz2 | |
am 727f36c6: Merge change 4265 into donut
Merge commit '727f36c6a1c70ba5519ec9ce2da9ab1cf303a2ef'
* commit '727f36c6a1c70ba5519ec9ce2da9ab1cf303a2ef':
process: Fix bug where if a thread exited while we were changing its control
Fix the build: Remove ADD_SYSTEM_SERVICE, which I had accidentally
Diffstat (limited to 'packages/SettingsProvider')
| -rw-r--r-- | packages/SettingsProvider/res/values/strings.xml | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/packages/SettingsProvider/res/values/strings.xml b/packages/SettingsProvider/res/values/strings.xml deleted file mode 100644 index 8a00091..0000000 --- a/packages/SettingsProvider/res/values/strings.xml +++ /dev/null @@ -1,23 +0,0 @@ -<?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> - <string name="permlab_writeGservices">Write Gservices settings.</string> - <string name="permdesc_writeGservices">Allows the application to - change the settings in Gservices.</string> -</resources> |