resolved conflicts for merge of b1fbd696 to jb-mr1-dev bug:6809603

<?xml version="1.0" encoding="utf-8"?>

<!--

/*

**

** Copyright 2012, 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>

    <bool name="im_is_default">true</bool>

</resources>

    ms: Malay/qwerty

    nb: Norwegian Bokmål/nordic

    nl: Dutch/qwerty

    nl_BE: Dutch Belgium/azerty

    pl: Polish/qwerty

    pt_BR: Portuguese Brazil/qwerty

    pt_PT: Portuguese Portugal/qwerty

            android:imeSubtypeMode="keyboard"

            android:imeSubtypeExtraValue="AsciiCapable,SupportTouchPositionCorrection"

    />

    <subtype android:icon="@drawable/ic_subtype_keyboard"

            android:label="@string/subtype_generic"

            android:imeSubtypeLocale="nl_BE"

            android:imeSubtypeMode="keyboard"

            android:imeSubtypeExtraValue="KeyboardLayoutSet=azerty,AsciiCapable"

    />

    <subtype android:icon="@drawable/ic_subtype_keyboard"

            android:label="@string/subtype_generic"

            android:subtypeId="1124698716"