diff options
author | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2015-12-15 11:54:10 +0100 |
---|---|---|
committer | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2015-12-15 11:54:10 +0100 |
commit | 60e5a34630c69e575f157a2babac70048cc3bdb1 (patch) | |
tree | 9691d92caa5fba82bf307cf2af3374c616053bb8 /overlay/frameworks/base/core/res/res/values/arrays.xml | |
parent | 8d57bd027ab7f354e1707510d3ba5654ba16c0aa (diff) | |
parent | 02a3b7b2c85b056f6172668ac9d2008a941a6df5 (diff) | |
download | device_samsung_smdk4412-common-60e5a34630c69e575f157a2babac70048cc3bdb1.zip device_samsung_smdk4412-common-60e5a34630c69e575f157a2babac70048cc3bdb1.tar.gz device_samsung_smdk4412-common-60e5a34630c69e575f157a2babac70048cc3bdb1.tar.bz2 |
Merge remote-tracking branch 'github/cm-13.0' into replicant-6.0
Conflicts:
BoardCommonConfig.mk
camera/Android.mk
common.mk
configs/80cfw
lpm.rc
overlay/frameworks/base/core/res/res/values/config.xml
overlay/packages/apps/Camera2/res/values/config.xml
Diffstat (limited to 'overlay/frameworks/base/core/res/res/values/arrays.xml')
-rw-r--r-- | overlay/frameworks/base/core/res/res/values/arrays.xml | 37 |
1 files changed, 0 insertions, 37 deletions
diff --git a/overlay/frameworks/base/core/res/res/values/arrays.xml b/overlay/frameworks/base/core/res/res/values/arrays.xml deleted file mode 100644 index fa33631..0000000 --- a/overlay/frameworks/base/core/res/res/values/arrays.xml +++ /dev/null @@ -1,37 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -/* //device/apps/common/assets/res/any/colors.xml -** -** Copyright 2006, 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"> - -<!-- Defines the shutdown options shown in the reboot dialog. --> - <array name="shutdown_reboot_options" translatable="false"> - <item>@string/reboot_reboot</item> - <item>@string/reboot_recovery</item> - <item>@string/reboot_download</item> - </array> - - <!-- Do not translate. Defines the shutdown actions passed to the kernel. - The first item should be empty for regular reboot. --> - <string-array name="shutdown_reboot_actions" translatable="false"> - <item></item> - <item>recovery</item> - <item>bootloader</item> - </string-array> - -</resources> |