diff options
| author | Makoto Onuki <omakoto@google.com> | 2015-06-05 21:31:42 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-06-05 21:31:42 +0000 |
| commit | 7ecbf2b1a41e25a02c9f1b2bc743e6709e70c591 (patch) | |
| tree | 82cec74b5eb2d26dff215358784d3c4af8bbe428 /packages/PrintSpooler | |
| parent | bc851023f2985bd93647d258b0c214040816b732 (diff) | |
| parent | fba7f5d73cce893860faa3af9df7b4099a8565a1 (diff) | |
| download | frameworks_base-7ecbf2b1a41e25a02c9f1b2bc743e6709e70c591.zip frameworks_base-7ecbf2b1a41e25a02c9f1b2bc743e6709e70c591.tar.gz frameworks_base-7ecbf2b1a41e25a02c9f1b2bc743e6709e70c591.tar.bz2 | |
am fba7f5d7: Merge "Fix crash on simplified Chinese." into mnc-dev
* commit 'fba7f5d73cce893860faa3af9df7b4099a8565a1':
Fix crash on simplified Chinese.
Diffstat (limited to 'packages/PrintSpooler')
| -rw-r--r-- | packages/PrintSpooler/res/values-zh-rCN/donottranslate.xml | 22 |
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> |