resolved conflicts for merge of c53ad4cd to jb-mr2-dev

Change-Id: I5fdbc5c8c20386f173efa8957e470a644e6c14ff

diff --cc media/java/android/media/AudioService.java
index aa91200,9ec5be3..cad20b8
--- 1/media/java/android/media/AudioService.java
--- 2/media/java/android/media/AudioService.java
+++ b/media/java/android/media/AudioService.java
@@@ -47,8 -45,9 +47,10 @@@ import android.content.res.XmlResourceP
  import android.database.ContentObserver;
  import android.media.MediaPlayer.OnCompletionListener;
  import android.media.MediaPlayer.OnErrorListener;
+ import android.net.http.CertificateChainValidator;
+ import android.net.http.SslError;
  import android.os.Binder;
 +import android.os.Build;
  import android.os.Bundle;
  import android.os.Environment;
  import android.os.Handler;
@@@ -70,19 -70,15 +72,21 @@@ import android.telephony.TelephonyManag
  import android.text.TextUtils;
  import android.util.Log;
  import android.view.KeyEvent;
 +import android.view.Surface;
  import android.view.VolumePanel;
 +import android.view.WindowManager;
  
  import com.android.internal.telephony.ITelephony;
 +import com.android.internal.util.XmlUtils;
 +
 +import org.xmlpull.v1.XmlPullParserException;
  
+ import java.io.ByteArrayInputStream;
  import java.io.FileDescriptor;
  import java.io.IOException;
  import java.io.PrintWriter;
 +import java.lang.reflect.Field;
+ import java.nio.ByteBuffer;
  import java.util.ArrayList;
  import java.util.concurrent.ConcurrentHashMap;
  import java.util.HashMap;

diff --cc media/java/android/media/IAudioService.aidl
Simple merge