Projects >> platform_frameworks_base >>7cd52895ec3e014c1097852725ba68646c1d6665

Chunk
Conflicting content 
import android.database.ContentObserver;
import android.media.MediaPlayer.OnCompletionListener;
import android.media.MediaPlayer.OnErrorListener;
<<<<<<< HEAD
import android.net.Uri;
=======
>>>>>>> 5035faba9a28f988291c4ff3d3cbf64d828f3f5a
import android.net.http.CertificateChainValidator;
import android.net.http.SslError;
import android.os.Binder;
Solution content 
import android.database.ContentObserver;
import android.media.MediaPlayer.OnCompletionListener;
import android.media.MediaPlayer.OnErrorListener;
import android.net.Uri;
import android.net.http.CertificateChainValidator;
import android.net.http.SslError;
import android.os.Binder;
File
AudioService.java
Developer's decision
Version 1
Kind of conflict
Import