Projects >> platform_frameworks_base >>04405925c7be041f561376517f995e4feceeab5f

Chunk
Conflicting content 
package android.content.res;

<<<<<<< HEAD
import android.annotation.AttrRes;
import android.annotation.ColorInt;
import android.annotation.StyleRes;
import android.annotation.StyleableRes;
import com.android.internal.util.GrowingArrayUtils;
=======
import android.animation.Animator;
import android.animation.StateListAnimator;
import android.annotation.NonNull;
import android.icu.text.PluralRules;
import android.util.Pools.SynchronizedPool;
import android.view.ViewDebug;
>>>>>>> 71165ea6404da5282db8459f9f20e374f4c07cdc
import com.android.internal.util.XmlUtils;

import org.xmlpull.v1.XmlPullParser;
Solution content 
package android.content.res;

import android.annotation.AttrRes;
import android.annotation.ColorInt;
import android.annotation.StyleRes;
import android.annotation.StyleableRes;
import android.icu.text.PluralRules;
import com.android.internal.util.GrowingArrayUtils;
import com.android.internal.util.XmlUtils;

import org.xmlpull.v1.XmlPullParser;
File
Resources.java
Developer's decision
Combination
Kind of conflict
Import
Chunk
Conflicting content 
     * @return CharSequence The string data associated with the resource, plus
     *         possibly styled text information.
     */
<<<<<<< HEAD
    public CharSequence getQuantityText(@PluralsRes int id, int quantity)
            throws NotFoundException {
        NativePluralRules rule = getPluralRule();
=======
    public CharSequence getQuantityText(int id, int quantity) throws NotFoundException {
        PluralRules rule = getPluralRule();
>>>>>>> 71165ea6404da5282db8459f9f20e374f4c07cdc
        CharSequence res = mAssets.getResourceBagText(id,
                attrForQuantityCode(rule.select(quantity)));
        if (res != null) {
Solution content 
     * @return CharSequence The string data associated with the resource, plus
     *         possibly styled text information.
     */
    public CharSequence getQuantityText(@PluralsRes int id, int quantity)
            throws NotFoundException {
        PluralRules rule = getPluralRule();
        CharSequence res = mAssets.getResourceBagText(id,
                attrForQuantityCode(rule.select(quantity)));
        if (res != null) {
File
Resources.java
Developer's decision
Combination
Kind of conflict
Method invocation
Method signature
Variable