summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Elliott Hughes <enh@google.com> 2013-05-06 20:29:09 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2013-05-06 20:29:09 +0000
commit601afaef5220aef928a9235e50376c462538a942 (patch)
treecb653a50fa6102c14c4a7abbca1e75e8bd304c02
parent6d82f86fa01800ee0523743366e0dc1113178fd9 (diff)
parentc00df6d52eb5f473e6e1a50fef8f17d8e712bc78 (diff)
Merge "Someone's IDE chose the wrong Date."
-rw-r--r--core/java/android/database/sqlite/SQLiteConnection.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/database/sqlite/SQLiteConnection.java b/core/java/android/database/sqlite/SQLiteConnection.java
index 0017c46a7a16..747f16233cb2 100644
--- 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;