am 601afaef: Merge "Someone\'s IDE chose the wrong Date."

* commit '601afaef5220aef928a9235e50376c462538a942': Someone's IDE chose the wrong Date.
2013-05-06 14:04:34 -07:00
parent 485d7a31a8 601afaef52
commit 4cd60897c7
1 changed files with 1 additions and 1 deletions
--- a/core/java/android/database/sqlite/SQLiteConnection.java
+++ b/core/java/android/database/sqlite/SQLiteConnection.java
@@ -30,9 +30,9 @@ import android.util.Log;
 import android.util.LruCache;
 import android.util.Printer;

-import java.sql.Date;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.Map;
 import java.util.regex.Pattern;