resolved conflicts for merge of 92aa5f4e to klp-dev-plus-aosp

<?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>

    <string-array name="pdf_printer_media_sizes" translatable="false">

        <item>NA_LETTER</item>

        <item>NA_GOVT_LETTER</item>

        <item>NA_LEGAL</item>

        <item>NA_JUNIOR_LEGAL</item>

        <item>NA_LEDGER</item>

        <item>NA_TABLOID</item>

        <item>NA_INDEX_3X5</item>

        <item>NA_INDEX_4X6</item>

        <item>NA_INDEX_5X8</item>

        <item>NA_MONARCH</item>

        <item>NA_QUARTO</item>

        <item>NA_FOOLSCAP</item>

    </string-array>

</resources>

<?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>

    <string name="mediasize_default">NA_LETTER</string>

    <string name="mediasize_standard">@string/mediasize_standard_north_america</string>

</resources>

        <item>JPN_KAHU</item>

        <item>JPN_KAKU2</item>

        <item>JPN_YOU4</item>

    </string-array>

</resources>