fix failed cherry pick of 022eb71b

Change-Id: If482f0ca33455b6612f3ba1bc8c1c4c1e3b34072

fix failed cherry pick of 022eb71b
Change-Id: If482f0ca33455b6612f3ba1bc8c1c4c1e3b34072
34a23e6e · android-build SharedAccount · e9d8bee6 · 34a23e6e
Commit 34a23e6e authored 15 years ago by android-build SharedAccount
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 6 deletions

src/com/android/providers/media/MediaProvider.java src/com/android/providers/media/MediaProvider.java +0 -6

No files found.
--- a/src/com/android/providers/media/MediaProvider.java
+++ b/src/com/android/providers/media/MediaProvider.java
@@ -3018,13 +3018,7 @@ public class MediaProvider extends ContentProvider {

    private static String TAG = "MediaProvider";
    private static final boolean LOCAL_LOGV = true;
-<<<<<<< HEAD:src/com/android/providers/media/MediaProvider.java
-    private static final int DATABASE_VERSION = 88;
-|||||||
-    private static final int DATABASE_VERSION = 89;
-=======
    private static final int DATABASE_VERSION = 90;
->>>>>>> 022eb71... Fix botched database update step.:src/com/android/providers/media/MediaProvider.java
    private static final String INTERNAL_DATABASE_NAME = "internal.db";

    // maximum number of cached external databases to keep