summaryrefslogtreecommitdiffstats
path: root/packages/PrintSpooler
diff options
context:
space:
mode:
authorMakoto Onuki <omakoto@google.com>2015-06-05 21:18:16 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-06-05 21:18:27 +0000
commitfba7f5d73cce893860faa3af9df7b4099a8565a1 (patch)
tree24efb1b4d46311fba8824b18532a0225e3ebda14 /packages/PrintSpooler
parent537bb5fce785c3433540e047c0ccaae3b286f55e (diff)
parent98112e886df07f6e4bb40e68f0f2ceabda0a0941 (diff)
downloadframeworks_base-fba7f5d73cce893860faa3af9df7b4099a8565a1.zip
frameworks_base-fba7f5d73cce893860faa3af9df7b4099a8565a1.tar.gz
frameworks_base-fba7f5d73cce893860faa3af9df7b4099a8565a1.tar.bz2
Merge "Fix crash on simplified Chinese." into mnc-dev
Diffstat (limited to 'packages/PrintSpooler')
-rw-r--r--packages/PrintSpooler/res/values-zh-rCN/donottranslate.xml22
1 files changed, 0 insertions, 22 deletions
diff --git a/packages/PrintSpooler/res/values-zh-rCN/donottranslate.xml b/packages/PrintSpooler/res/values-zh-rCN/donottranslate.xml
deleted file mode 100644
index f069da3..0000000
--- a/packages/PrintSpooler/res/values-zh-rCN/donottranslate.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2013 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">
-
- <string name="mediasize_default">PRC_9</string>
- <string name="mediasize_standard">@string/mediasize_standard_china</string>
-
-</resources>