diff options
| author | Xavier Ducrohet <xav@android.com> | 2012-08-10 18:30:26 -0700 |
|---|---|---|
| committer | Xavier Ducrohet <xav@android.com> | 2012-08-13 17:37:44 -0700 |
| commit | 81cefe2a26dd6db8a878e30874d12cdcbff0e83b (patch) | |
| tree | 970e5de5045fe1fa5255c3dd868cecc413f23beb /manifmerger/src | |
| parent | eb0e35abd8ec368b10ec2026642583ac8b330929 (diff) | |
| download | sdk-81cefe2a26dd6db8a878e30874d12cdcbff0e83b.zip sdk-81cefe2a26dd6db8a878e30874d12cdcbff0e83b.tar.gz sdk-81cefe2a26dd6db8a878e30874d12cdcbff0e83b.tar.bz2 | |
More refactoring.
Move stuff out of sdklib into common and ide_common.
Remove androidprefs and move the one class into common.
Change-Id: I71d126a13cf2ba413692e29616f4968a37d7b33a
Diffstat (limited to 'manifmerger/src')
| -rwxr-xr-x | manifmerger/src/com/android/manifmerger/ManifestMerger.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/manifmerger/src/com/android/manifmerger/ManifestMerger.java b/manifmerger/src/com/android/manifmerger/ManifestMerger.java index d63ecd8..c5153e9 100755 --- a/manifmerger/src/com/android/manifmerger/ManifestMerger.java +++ b/manifmerger/src/com/android/manifmerger/ManifestMerger.java @@ -16,12 +16,12 @@ package com.android.manifmerger; +import com.android.SdkConstants; import com.android.annotations.NonNull; import com.android.annotations.Nullable; import com.android.manifmerger.IMergerLog.FileAndLine; import com.android.manifmerger.IMergerLog.Severity; -import com.android.sdklib.SdkConstants; -import com.android.sdklib.xml.AndroidXPathFactory; +import com.android.xml.AndroidXPathFactory; import org.w3c.dom.Attr; import org.w3c.dom.Document; |