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

Commit ad2fa35d authored Dec 21, 2009 by Tom Taylor Committed by Android Git Automerger Dec 21, 2009

am d4a4729c: Update imports to android-common

Merge commit 'd4a4729c' into eclair-mr2-plus-aosp

* commit 'd4a4729c':
  Update imports to android-common

parents 497cf2b9 d4a4729c

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -18,7 +18,7 @@ package android.content;

		import com.android.internal.os.AtomicFile;
		import com.android.internal.util.ArrayUtils;
		import com.android.internal.util.FastXmlSerializer;
		import com.android.common.FastXmlSerializer;

		import org.xmlpull.v1.XmlPullParser;
		import org.xmlpull.v1.XmlPullParserException;