diff options
| author | Marco Nelissen <marcone@google.com> | 2011-06-06 16:29:34 -0700 |
|---|---|---|
| committer | Marco Nelissen <marcone@google.com> | 2011-06-06 16:29:34 -0700 |
| commit | 079e30cd2a09388ba9ad2149a66de86be4f3a7ac (patch) | |
| tree | 1aff9e7f72cee28e70e2f02ee7b12ae807a02c69 /res/values/config.xml | |
| parent | cfe26919abcd3c466f40b437d084311bf025d449 (diff) | |
| parent | 531bed610c363bae71ff3d7b360f7c9ce612693e (diff) | |
| download | packages_apps_Settings-079e30cd2a09388ba9ad2149a66de86be4f3a7ac.zip packages_apps_Settings-079e30cd2a09388ba9ad2149a66de86be4f3a7ac.tar.gz packages_apps_Settings-079e30cd2a09388ba9ad2149a66de86be4f3a7ac.tar.bz2 | |
resolved conflicts for merge of 531bed61 to honeycomb-plus-aosp
Change-Id: I28154c6feb563712eeda3e1176d62c7d2a28eff8
Diffstat (limited to 'res/values/config.xml')
| -rwxr-xr-x | res/values/config.xml | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/res/values/config.xml b/res/values/config.xml new file mode 100755 index 0000000..4b08c42 --- /dev/null +++ b/res/values/config.xml @@ -0,0 +1,22 @@ +<?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 xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + + <!-- If false, MIN is displayed. If true, MSID is displayed. --> + <bool name="config_msid_enable" translatable="false">false</bool> + +</resources> |