Merge "NEW_API: Unhide android.hardware.Camera.Parameters#SCENE_MODE_HDR" into jb-mr1-dev

Author: Eino-Ville Talvala

api/current.txt

@@ -9865,6 +9865,7 @@ package android.hardware {
     field public static final java.lang.String SCENE_MODE_BEACH = "beach";
     field public static final java.lang.String SCENE_MODE_CANDLELIGHT = "candlelight";
     field public static final java.lang.String SCENE_MODE_FIREWORKS = "fireworks";
+    field public static final java.lang.String SCENE_MODE_HDR = "hdr";
     field public static final java.lang.String SCENE_MODE_LANDSCAPE = "landscape";
     field public static final java.lang.String SCENE_MODE_NIGHT = "night";
     field public static final java.lang.String SCENE_MODE_NIGHT_PORTRAIT = "night-portrait";

core/java/android/hardware/Camera.java

@@ -1811,7 +1811,6 @@ public class Parameters {
          * camera will return an image that has an extended dynamic range
          * compared to a regular capture. Capturing such an image may take
          * longer than a regular capture.
-         * @hide
          */
         public static final String SCENE_MODE_HDR = "hdr";