diff options
| author | Owen Lin <owenlin@google.com> | 2011-11-11 18:17:26 +0800 |
|---|---|---|
| committer | Owen Lin <owenlin@google.com> | 2011-11-11 18:17:26 +0800 |
| commit | ddcca63483efc9b8e84acf3cd002e27a37123f2e (patch) | |
| tree | 72aac314cbbc2f46aef657b7d040f9be73182d79 | |
| parent | 464b66583c0d455d1e1c407f1128545060821688 (diff) | |
| download | android_packages_apps_Snap-ddcca63483efc9b8e84acf3cd002e27a37123f2e.tar.gz android_packages_apps_Snap-ddcca63483efc9b8e84acf3cd002e27a37123f2e.tar.bz2 android_packages_apps_Snap-ddcca63483efc9b8e84acf3cd002e27a37123f2e.zip | |
resolved conflicts for merge of 64d592c0 to master
Change-Id: Iae4a66e37fcb852c4b105fe732c6597b638b2059
| -rw-r--r-- | gallerycommon/src/com/android/gallery3d/common/FileCache.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gallerycommon/src/com/android/gallery3d/common/FileCache.java b/gallerycommon/src/com/android/gallery3d/common/FileCache.java index a69d6e170..86a195532 100644 --- a/gallerycommon/src/com/android/gallery3d/common/FileCache.java +++ b/gallerycommon/src/com/android/gallery3d/common/FileCache.java @@ -16,8 +16,6 @@ package com.android.gallery3d.common; -import com.android.gallery3d.common.Entry.Table; - import android.content.ContentValues; import android.content.Context; import android.database.Cursor; @@ -25,6 +23,8 @@ import android.database.sqlite.SQLiteDatabase; import android.database.sqlite.SQLiteOpenHelper; import android.util.Log; +import com.android.gallery3d.common.Entry.Table; + import java.io.File; import java.io.IOException; |