Merge "Adopting refactoring from 145321" into studio-1.3-dev automerge: 9f667c6
automerge: 59c24b5

* commit '59c24b5d7857e287db15348d55e561ffff6d733a':
  Adopting refactoring from 145321

diff --git a/sdkmanager/sdkuilib/src/main/java/com/android/sdkuilib/internal/repository/SdkUpdaterChooserDialog.java b/sdkmanager/sdkuilib/src/main/java/com/android/sdkuilib/internal/repository/SdkUpdaterChooserDialog.java
index 1a82919..bb9bff9 100755
--- a/sdkmanager/sdkuilib/src/main/java/com/android/sdkuilib/internal/repository/SdkUpdaterChooserDialog.java
+++ b/sdkmanager/sdkuilib/src/main/java/com/android/sdkuilib/internal/repository/SdkUpdaterChooserDialog.java

@@ -22,12 +22,12 @@
 import com.android.sdklib.AndroidVersion;
 import com.android.sdklib.internal.repository.archives.Archive;
 import com.android.sdklib.internal.repository.packages.IAndroidVersionProvider;
-import com.android.sdklib.internal.repository.packages.License;
 import com.android.sdklib.internal.repository.packages.Package;
 import com.android.sdklib.internal.repository.sources.SdkSource;
 import com.android.sdklib.internal.repository.updater.ArchiveInfo;
 import com.android.sdklib.internal.repository.updater.SdkUpdaterLogic;
 import com.android.sdklib.repository.FullRevision;
+import com.android.sdklib.repository.License;
 import com.android.sdkuilib.internal.repository.icons.ImageFactory;
 import com.android.sdkuilib.ui.GridDialog;
 

diff --git a/sdkmanager/sdkuilib/src/main/java/com/android/sdkuilib/internal/repository/core/PkgContentProvider.java b/sdkmanager/sdkuilib/src/main/java/com/android/sdkuilib/internal/repository/core/PkgContentProvider.java
index 7f124d5..ade0e6f 100755
--- a/sdkmanager/sdkuilib/src/main/java/com/android/sdkuilib/internal/repository/core/PkgContentProvider.java
+++ b/sdkmanager/sdkuilib/src/main/java/com/android/sdkuilib/internal/repository/core/PkgContentProvider.java

@@ -16,11 +16,11 @@
 
 package com.android.sdkuilib.internal.repository.core;
 
-import com.android.sdklib.internal.repository.IDescription;
 import com.android.sdklib.internal.repository.archives.Archive;
 import com.android.sdklib.internal.repository.packages.Package;
 import com.android.sdklib.internal.repository.sources.SdkSource;
 import com.android.sdklib.internal.repository.updater.PkgItem;
+import com.android.sdklib.repository.IDescription;
 import com.android.sdkuilib.internal.repository.ui.PackagesPage;
 
 import org.eclipse.jface.viewers.IInputProvider;

diff --git a/sdkmanager/sdkuilib/src/main/java/com/android/sdkuilib/internal/repository/ui/PackagesPageImpl.java b/sdkmanager/sdkuilib/src/main/java/com/android/sdkuilib/internal/repository/ui/PackagesPageImpl.java
index 0ab8f01..f0b4325 100755
--- a/sdkmanager/sdkuilib/src/main/java/com/android/sdkuilib/internal/repository/ui/PackagesPageImpl.java
+++ b/sdkmanager/sdkuilib/src/main/java/com/android/sdkuilib/internal/repository/ui/PackagesPageImpl.java

@@ -20,7 +20,6 @@
 import com.android.sdklib.AndroidVersion;
 import com.android.sdklib.internal.repository.DownloadCache;
 import com.android.sdklib.internal.repository.DownloadCache.Strategy;
-import com.android.sdklib.internal.repository.IDescription;
 import com.android.sdklib.internal.repository.archives.Archive;
 import com.android.sdklib.internal.repository.packages.Package;
 import com.android.sdklib.internal.repository.sources.SdkSource;
@@ -28,6 +27,7 @@
 import com.android.sdklib.internal.repository.updater.PackageLoader.ISourceLoadedCallback;
 import com.android.sdklib.internal.repository.updater.PkgItem;
 import com.android.sdklib.internal.repository.updater.PkgItem.PkgState;
+import com.android.sdklib.repository.IDescription;
 import com.android.sdkuilib.internal.repository.SwtUpdaterData;
 import com.android.sdkuilib.internal.repository.core.PackagesDiffLogic;
 import com.android.sdkuilib.internal.repository.core.PkgCategory;