commit 3c3b5b5e0bc05564e0f8ecc680ace523e11bd923
author Wu-cheng Li <wuchengli@google.com> Wed Apr 18 23:13:10 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Wed Apr 18 23:13:10 2012 -0700
tree 2eb0ae1b787bd7402a21b3441b77cbedd75af888
parent 1ee4139fc3e82304755bbd92a7aa1323fd8a3534
parent ac13cc06ee35a9890d35af25b6cd2df2841e1384

Merge "Unhide MediaColumns.WIDTH and MediaColumns.HEIGHT."

api/current.txt

diff --git a/api/current.txt b/api/current.txt
index 080449b..5eaf380 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -17843,9 +17843,11 @@
     field public static final java.lang.String DATE_ADDED = "date_added";
     field public static final java.lang.String DATE_MODIFIED = "date_modified";
     field public static final java.lang.String DISPLAY_NAME = "_display_name";
+    field public static final java.lang.String HEIGHT = "height";
     field public static final java.lang.String MIME_TYPE = "mime_type";
     field public static final java.lang.String SIZE = "_size";
     field public static final java.lang.String TITLE = "title";
+    field public static final java.lang.String WIDTH = "width";
   }
 
   public static final class MediaStore.Video {

core/java/android/provider/MediaStore.java

diff --git a/core/java/android/provider/MediaStore.java b/core/java/android/provider/MediaStore.java
index 38945c2..79d0144 100644
--- a/core/java/android/provider/MediaStore.java
+++ b/core/java/android/provider/MediaStore.java
@@ -306,13 +306,11 @@
 
         /**
          * The width of the image/video in pixels.
-         * @hide
          */
         public static final String WIDTH = "width";
 
         /**
          * The height of the image/video in pixels.
-         * @hide
          */
         public static final String HEIGHT = "height";
      }