diff options
| author | Elliott Hughes <enh@google.com> | 2013-05-06 14:04:34 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-05-06 14:04:34 -0700 |
| commit | 4cd60897c73ddd67d7f267432073363cbf75371e (patch) | |
| tree | da22e2615cded7b1072c72bb30efa045b13b6a03 /core/java/android/database | |
| parent | 485d7a31a8a07c825281cbae789ca0d04f3949d7 (diff) | |
| parent | 601afaef5220aef928a9235e50376c462538a942 (diff) | |
| download | frameworks_base-4cd60897c73ddd67d7f267432073363cbf75371e.zip frameworks_base-4cd60897c73ddd67d7f267432073363cbf75371e.tar.gz frameworks_base-4cd60897c73ddd67d7f267432073363cbf75371e.tar.bz2 | |
am 601afaef: Merge "Someone\'s IDE chose the wrong Date."
* commit '601afaef5220aef928a9235e50376c462538a942':
Someone's IDE chose the wrong Date.
Diffstat (limited to 'core/java/android/database')
| -rw-r--r-- | core/java/android/database/sqlite/SQLiteConnection.java | 2 |
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 4f59e8e..725a1ff 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; |