am 4804c3e2: Merge change 22564 into eclair

Merge commit '4804c3e23b0bb8e77b690df177ebd4d6fb949aa8' into eclair-plus-aosp

* commit '4804c3e23b0bb8e77b690df177ebd4d6fb949aa8':
  Add an extra intent parameter for recording duration limit.

core/java/android/provider/MediaStore.java

@@ -163,6 +163,12 @@ public final class MediaStore
      */
     public final static String EXTRA_SIZE_LIMIT = "android.intent.extra.sizeLimit";
 
+    /**
+     * Specify the maximum allowed recording duration in seconds.
+     * @hide
+     */
+    public final static String EXTRA_DURATION_LIMIT = "android.intent.extra.durationLimit";
+
     /**
      * The name of the Intent-extra used to indicate a content resolver Uri to be used to
      * store the requested image or video.