summaryrefslogtreecommitdiffstats
path: root/overlay/packages/apps/Settings/res/values-th
diff options
context:
space:
mode:
authorWolfgang Wiedmeyer <wolfgit@wiedmeyer.de>2015-12-15 11:54:10 +0100
committerWolfgang Wiedmeyer <wolfgit@wiedmeyer.de>2015-12-15 11:54:10 +0100
commit60e5a34630c69e575f157a2babac70048cc3bdb1 (patch)
tree9691d92caa5fba82bf307cf2af3374c616053bb8 /overlay/packages/apps/Settings/res/values-th
parent8d57bd027ab7f354e1707510d3ba5654ba16c0aa (diff)
parent02a3b7b2c85b056f6172668ac9d2008a941a6df5 (diff)
downloaddevice_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/packages/apps/Settings/res/values-th')
-rw-r--r--overlay/packages/apps/Settings/res/values-th/arrays.xml31
1 files changed, 0 insertions, 31 deletions
diff --git a/overlay/packages/apps/Settings/res/values-th/arrays.xml b/overlay/packages/apps/Settings/res/values-th/arrays.xml
deleted file mode 100644
index 0a62eb2..0000000
--- a/overlay/packages/apps/Settings/res/values-th/arrays.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/*
-**
-** Copyright 2011 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-array name="screen_timeout_entries">
- <item msgid="5314770629356662739">"15 วินาที"</item>
- <item msgid="8672738773876256432">"30 วินาที"</item>
- <item msgid="465923292941002466">"1 นาที"</item>
- <item msgid="7955177189296850016">"2 นาที"</item>
- <item msgid="1244255986255344525">"5 นาที"</item>
- <item msgid="294890536998091748">"10 นาที"</item>
- </string-array>
-</resources>