Sorting imports.

Change-Id: I8347bc625480a1c37a1ed9976193ddfedeb00bbc

15 files changed, 40 insertions, 33 deletions

diff --git a/dalvik/src/main/java/dalvik/annotation/AnnotationDefault.java b/dalvik/src/main/java/dalvik/annotation/AnnotationDefault.java
index 91b5d15..98062fb 100644
--- a/dalvik/src/main/java/dalvik/annotation/AnnotationDefault.java
+++ b/dalvik/src/main/java/dalvik/annotation/AnnotationDefault.java
@@ -16,7 +16,10 @@
 
 package dalvik.annotation;
 
-import java.lang.annotation.*;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
 
 /**
  * A "system annotation" used to provide the AnnotationDefault attribute.
diff --git a/dalvik/src/main/java/dalvik/annotation/EnclosingClass.java b/dalvik/src/main/java/dalvik/annotation/EnclosingClass.java
index a15993a..2546c4c 100644
--- a/dalvik/src/main/java/dalvik/annotation/EnclosingClass.java
+++ b/dalvik/src/main/java/dalvik/annotation/EnclosingClass.java
@@ -16,7 +16,10 @@
 
 package dalvik.annotation;
 
-import java.lang.annotation.*;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
 
 /**
  * A "system annotation" used to provide part of the InnerClasses attribute.
diff --git a/dalvik/src/main/java/dalvik/annotation/EnclosingMethod.java b/dalvik/src/main/java/dalvik/annotation/EnclosingMethod.java
index 88d5e52..1a97155 100644
--- a/dalvik/src/main/java/dalvik/annotation/EnclosingMethod.java
+++ b/dalvik/src/main/java/dalvik/annotation/EnclosingMethod.java
@@ -16,7 +16,10 @@
 
 package dalvik.annotation;
 
-import java.lang.annotation.*;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
 
 /**
  * A "system annotation" used to provide the EnclosingMethod attribute.
diff --git a/dalvik/src/main/java/dalvik/annotation/InnerClass.java b/dalvik/src/main/java/dalvik/annotation/InnerClass.java
index 02cf704..054842f 100644
--- a/dalvik/src/main/java/dalvik/annotation/InnerClass.java
+++ b/dalvik/src/main/java/dalvik/annotation/InnerClass.java
@@ -16,7 +16,10 @@
 
 package dalvik.annotation;
 
-import java.lang.annotation.*;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
 
 /**
  * A "system annotation" used to provide part of the InnerClasses attribute.
diff --git a/dalvik/src/main/java/dalvik/annotation/MemberClasses.java b/dalvik/src/main/java/dalvik/annotation/MemberClasses.java
index 5b201da..b213be7 100644
--- a/dalvik/src/main/java/dalvik/annotation/MemberClasses.java
+++ b/dalvik/src/main/java/dalvik/annotation/MemberClasses.java
@@ -16,7 +16,10 @@
 
 package dalvik.annotation;
 
-import java.lang.annotation.*;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
 
 /**
  * A "system annotation" used to provide the MemberClasses list.
diff --git a/dalvik/src/main/java/dalvik/annotation/Signature.java b/dalvik/src/main/java/dalvik/annotation/Signature.java
index 86b22de..b96d7dd 100644
--- a/dalvik/src/main/java/dalvik/annotation/Signature.java
+++ b/dalvik/src/main/java/dalvik/annotation/Signature.java
@@ -16,7 +16,10 @@
 
 package dalvik.annotation;
 
-import java.lang.annotation.*;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
 
 /**
  * A "system annotation" used to provide the Signature attribute.
diff --git a/dalvik/src/main/java/dalvik/annotation/TestTargetClass.java b/dalvik/src/main/java/dalvik/annotation/TestTargetClass.java
index 7d0f638..9144a41 100644
--- a/dalvik/src/main/java/dalvik/annotation/TestTargetClass.java
+++ b/dalvik/src/main/java/dalvik/annotation/TestTargetClass.java
@@ -21,8 +21,6 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import dalvik.annotation.TestTargetNew;
-
 /**
  * Defines an annotation for test classes that allows to link them to the class
  * that is being tested. The current assumption is that the test are somewhat
diff --git a/dalvik/src/main/java/dalvik/annotation/TestTargets.java b/dalvik/src/main/java/dalvik/annotation/TestTargets.java
index 8358561..207572c 100644
--- a/dalvik/src/main/java/dalvik/annotation/TestTargets.java
+++ b/dalvik/src/main/java/dalvik/annotation/TestTargets.java
@@ -21,8 +21,6 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import dalvik.annotation.TestTargetNew;
-
 /**
  * Defines an annotation for test classes that allows to link them to the class
  * that is being tested. The current assumption is that the test are somewhat
diff --git a/dalvik/src/main/java/dalvik/annotation/Throws.java b/dalvik/src/main/java/dalvik/annotation/Throws.java
index 342d890..161116a 100644
--- a/dalvik/src/main/java/dalvik/annotation/Throws.java
+++ b/dalvik/src/main/java/dalvik/annotation/Throws.java
@@ -16,7 +16,10 @@
 
 package dalvik.annotation;
 
-import java.lang.annotation.*;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
 
 /**
  * A "system annotation" used to provide the Exceptions attribute.
diff --git a/dalvik/src/main/java/dalvik/system/BlockGuard.java b/dalvik/src/main/java/dalvik/system/BlockGuard.java
index b3d5c90..233c0ee 100644
--- a/dalvik/src/main/java/dalvik/system/BlockGuard.java
+++ b/dalvik/src/main/java/dalvik/system/BlockGuard.java
@@ -16,20 +16,16 @@
 
 package dalvik.system;
 
-import org.apache.harmony.luni.platform.IFileSystem;
-import org.apache.harmony.luni.platform.INetworkSystem;
-
 import java.io.FileDescriptor;
 import java.io.FileNotFoundException;
 import java.io.IOException;
-import java.io.IOException;
 import java.net.DatagramPacket;
 import java.net.InetAddress;
 import java.net.SocketException;
-import java.net.SocketOptions;
 import java.net.SocketImpl;
-import java.net.UnknownHostException;
-import java.nio.channels.Channel;
+import java.net.SocketOptions;
+import org.apache.harmony.luni.platform.IFileSystem;
+import org.apache.harmony.luni.platform.INetworkSystem;
 
 /**
  * Mechanism to let threads set restrictions on what code is allowed
diff --git a/dalvik/src/main/java/dalvik/system/DexClassLoader.java b/dalvik/src/main/java/dalvik/system/DexClassLoader.java
index 86f83c2..c6e13f8 100644
--- a/dalvik/src/main/java/dalvik/system/DexClassLoader.java
+++ b/dalvik/src/main/java/dalvik/system/DexClassLoader.java
@@ -18,11 +18,9 @@ package dalvik.system;
 
 import java.io.File;
 import java.io.IOException;
+import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.zip.ZipFile;
-import java.net.MalformedURLException;
-
-import dalvik.system.DexFile;
 
 /**
  * Provides a simple {@link ClassLoader} implementation that operates on a
diff --git a/dalvik/src/main/java/dalvik/system/PathClassLoader.java b/dalvik/src/main/java/dalvik/system/PathClassLoader.java
index b4b2fee..1bbcbc2 100644
--- a/dalvik/src/main/java/dalvik/system/PathClassLoader.java
+++ b/dalvik/src/main/java/dalvik/system/PathClassLoader.java
@@ -19,18 +19,16 @@ package dalvik.system;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.FileNotFoundException;
-import java.io.InputStream;
 import java.io.IOException;
+import java.io.InputStream;
 import java.io.RandomAccessFile;
+import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.ArrayList;
 import java.util.Enumeration;
 import java.util.NoSuchElementException;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipFile;
-import java.net.MalformedURLException;
-
-import dalvik.system.DexFile;
 
 /**
  * Provides a simple {@link ClassLoader} implementation that operates on a list
diff --git a/dalvik/src/main/java/dalvik/system/SamplingProfiler.java b/dalvik/src/main/java/dalvik/system/SamplingProfiler.java
index 1d88dd1..65d1762 100644
--- a/dalvik/src/main/java/dalvik/system/SamplingProfiler.java
+++ b/dalvik/src/main/java/dalvik/system/SamplingProfiler.java
@@ -16,10 +16,10 @@
 
 package dalvik.system;
 
-import java.util.logging.Logger;
-import java.io.DataInputStream;
 import java.io.ByteArrayInputStream;
+import java.io.DataInputStream;
 import java.io.IOException;
+import java.util.logging.Logger;
 
 /**
  * A sampling profiler.
diff --git a/dalvik/src/main/java/dalvik/system/TouchDex.java b/dalvik/src/main/java/dalvik/system/TouchDex.java
index 129dc70..0952e30 100644
--- a/dalvik/src/main/java/dalvik/system/TouchDex.java
+++ b/dalvik/src/main/java/dalvik/system/TouchDex.java
@@ -17,10 +17,10 @@
 package dalvik.system;
 
 import java.io.BufferedReader;
-import java.io.InputStreamReader;
-import java.io.IOException;
 import java.io.File;
 import java.io.FilenameFilter;
+import java.io.IOException;
+import java.io.InputStreamReader;
 
 /**
  * Induces optimization/verification of a set of DEX files.
diff --git a/dalvik/src/main/java/dalvik/system/TouchDexLoader.java b/dalvik/src/main/java/dalvik/system/TouchDexLoader.java
index 615fb24..3861791 100644
--- a/dalvik/src/main/java/dalvik/system/TouchDexLoader.java
+++ b/dalvik/src/main/java/dalvik/system/TouchDexLoader.java
@@ -19,15 +19,13 @@ package dalvik.system;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.FileNotFoundException;
-import java.io.InputStream;
 import java.io.IOException;
+import java.io.InputStream;
 import java.io.RandomAccessFile;
+import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipFile;
-import java.net.MalformedURLException;
-
-import dalvik.system.DexFile;
 
 /**
  * Cloned out of PathClassLoader for TouchDex.  This could be made