Projects >> android_frameworks_base >>b8796212e3544262193960ade01db6cb2023c8f9

Chunk
Conflicting content 
        if (this.contentView != null) {
            that.contentView = this.contentView.clone();
        }
<<<<<<< HEAD
        if (this.largeIcon != null) {
            that.largeIcon = Bitmap.createBitmap(this.largeIcon);
        }
        that.iconLevel = that.iconLevel;
=======
        that.iconLevel = this.iconLevel;
>>>>>>> ceae99835ed909346f23cc604d20a488ac63c6ce
        that.sound = this.sound; // android.net.Uri is immutable
        that.audioStreamType = this.audioStreamType;
Solution content 
        if (this.contentView != null) {
            that.contentView = this.contentView.clone();
        }
        if (this.largeIcon != null) {
            that.largeIcon = Bitmap.createBitmap(this.largeIcon);
        }
        that.iconLevel = this.iconLevel;
        that.sound = this.sound; // android.net.Uri is immutable
        that.audioStreamType = this.audioStreamType;
File
Notification.java
Developer's decision
Combination
Kind of conflict
Attribute
If statement
Variable