diff options
| author | Narayan Kamath <narayan@google.com> | 2015-03-23 14:19:43 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-03-23 14:19:43 +0000 |
| commit | c2ea6b74971886c3f6745afa7b836dde2810ac3c (patch) | |
| tree | 8899737e8f37465a93799154c3a91a8f551390e7 | |
| parent | 12eae246c5aaf836e9ceebe55117dff650bb2821 (diff) | |
| parent | 1fdfadf00a468dd460dd25bf2e074cfb2a225a04 (diff) | |
| download | platform_packages_apps_Gallery2-master-soong.tar.gz platform_packages_apps_Gallery2-master-soong.tar.bz2 platform_packages_apps_Gallery2-master-soong.zip | |
Merge "Use java.util.Date instead of java.sql.Date."android-wear-5.1.1_r1android-wear-5.1.0_r1master-soong
| -rw-r--r-- | src/com/android/gallery3d/filtershow/tools/SaveImage.java | 2 | ||||
| -rw-r--r-- | src/com/android/gallery3d/util/SaveVideoFileUtils.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/gallery3d/filtershow/tools/SaveImage.java b/src/com/android/gallery3d/filtershow/tools/SaveImage.java index 0c12fa4d9..17d698f15 100644 --- a/src/com/android/gallery3d/filtershow/tools/SaveImage.java +++ b/src/com/android/gallery3d/filtershow/tools/SaveImage.java @@ -49,8 +49,8 @@ import java.io.FilenameFilter; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; -import java.sql.Date; import java.text.SimpleDateFormat; +import java.util.Date; import java.util.TimeZone; /** diff --git a/src/com/android/gallery3d/util/SaveVideoFileUtils.java b/src/com/android/gallery3d/util/SaveVideoFileUtils.java index 10c41de90..bef75bac4 100644 --- a/src/com/android/gallery3d/util/SaveVideoFileUtils.java +++ b/src/com/android/gallery3d/util/SaveVideoFileUtils.java @@ -28,8 +28,8 @@ import android.provider.MediaStore.Video.VideoColumns; import com.android.gallery3d.filtershow.tools.SaveImage.ContentResolverQueryCallback; import java.io.File; -import java.sql.Date; import java.text.SimpleDateFormat; +import java.util.Date; public class SaveVideoFileUtils { // This function can decide which folder to save the video file, and generate |