Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a8181d53 authored by Android (Google) Code Review's avatar Android (Google) Code Review
Browse files

Merge change Ia4362cd4 

* changes:
  resolved conflicts for merge of ad2fa35d to master
parents b9a44165 f0108cda

core/java/android/app/AliasActivity.java

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ import android.content.res.XmlResourceParser; 
import android.os.Bundle;

import android.util.AttributeSet;

import android.util.Xml;

import com.android.internal.util.XmlUtils;

import com.android.common.XmlUtils;



import java.io.IOException;

core/java/android/app/ApplicationContext.java

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
package android.app;



import com.android.internal.policy.PolicyManager;

import com.android.internal.util.XmlUtils;

import com.android.common.XmlUtils;

import com.google.android.collect.Maps;



import org.xmlpull.v1.XmlPullParserException;

core/java/android/content/Intent.java

+46 −46
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ import android.os.Parcel; 
import android.os.Parcelable;

import android.util.AttributeSet;

import android.util.Log;

import com.android.internal.util.XmlUtils;

import com.android.common.XmlUtils;



import java.io.IOException;

import java.io.Serializable;

core/java/android/content/IntentFilter.java

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ import android.util.AndroidException; 
import android.util.Config;

import android.util.Log;

import android.util.Printer;

import com.android.internal.util.XmlUtils;

import com.android.common.XmlUtils;



/**

 * Structured description of Intent values to be matched.  An IntentFilter can

core/java/android/content/SyncStorageEngine.java

+5 −5
Original line number Diff line number Diff line
@@ -16,6 +16,10 @@ 


package android.content;



import com.android.internal.os.AtomicFile;

import com.android.internal.util.ArrayUtils;

import com.android.common.FastXmlSerializer;



import org.xmlpull.v1.XmlPullParser;

import org.xmlpull.v1.XmlPullParserException;

import org.xmlpull.v1.XmlSerializer;
@@ -37,10 +41,6 @@ import android.util.Log; 
import android.util.SparseArray;

import android.util.Xml;



import com.android.internal.os.AtomicFile;

import com.android.internal.util.ArrayUtils;

import com.android.internal.util.FastXmlSerializer;



import java.io.File;

import java.io.FileInputStream;

import java.io.FileOutputStream;