Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 03bf197d authored by Narayan Kamath's avatar Narayan Kamath Committed by Android Git Automerger
Browse files

am c4d22557: am c2ea6b74: Merge "Use java.util.Date instead of java.sql.Date." 

* commit 'c4d22557':
  Use java.util.Date instead of java.sql.Date.
parents 54f1231d c4d22557

src/com/android/gallery3d/filtershow/tools/SaveImage.java

+1 −1
Original line number Diff line number Diff line
@@ -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;



/**

src/com/android/gallery3d/util/SaveVideoFileUtils.java

+1 −1
Original line number Diff line number Diff line
@@ -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