diff options
| author | Tom Taylor <tomtaylor@google.com> | 2009-12-22 10:11:55 -0800 |
|---|---|---|
| committer | Tom Taylor <tomtaylor@google.com> | 2009-12-22 10:11:55 -0800 |
| commit | f0108cda21bec61418b24aa6217406072780b5d5 (patch) | |
| tree | 8866dfdec50a4bff63f188784779f7e1a9aa0216 /core/java/android/content/pm | |
| parent | fddd8f96f34b622cbdd0d891f8a7f5b7e18fdbf8 (diff) | |
| parent | ad2fa35d888e0763bfef0fc060775bec5d169479 (diff) | |
| download | frameworks_base-f0108cda21bec61418b24aa6217406072780b5d5.zip frameworks_base-f0108cda21bec61418b24aa6217406072780b5d5.tar.gz frameworks_base-f0108cda21bec61418b24aa6217406072780b5d5.tar.bz2 | |
resolved conflicts for merge of ad2fa35d to master
Change-Id: Ia4362cd48ac0689b91003943a4cd9660da72ff90
Diffstat (limited to 'core/java/android/content/pm')
| -rw-r--r-- | core/java/android/content/pm/PackageParser.java | 2 | ||||
| -rw-r--r-- | core/java/android/content/pm/RegisteredServicesCache.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/content/pm/PackageParser.java b/core/java/android/content/pm/PackageParser.java index 48d1add..ad99f54 100644 --- a/core/java/android/content/pm/PackageParser.java +++ b/core/java/android/content/pm/PackageParser.java @@ -35,7 +35,7 @@ import android.util.Config; import android.util.DisplayMetrics; import android.util.Log; import android.util.TypedValue; -import com.android.internal.util.XmlUtils; +import com.android.common.XmlUtils; import java.io.File; import java.io.IOException; diff --git a/core/java/android/content/pm/RegisteredServicesCache.java b/core/java/android/content/pm/RegisteredServicesCache.java index b39a67d..b819fa0 100644 --- a/core/java/android/content/pm/RegisteredServicesCache.java +++ b/core/java/android/content/pm/RegisteredServicesCache.java @@ -43,7 +43,7 @@ import java.io.IOException; import java.io.FileInputStream; import com.android.internal.os.AtomicFile; -import com.android.internal.util.FastXmlSerializer; +import com.android.common.FastXmlSerializer; import com.google.android.collect.Maps; import com.google.android.collect.Lists; |