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

Author: Eino-Ville Talvala

api/current.txt

@@ -9675,6 +9675,7 @@ package android.hardware {
     method public final void addCallbackBuffer(byte[]);
     method public final void autoFocus(android.hardware.Camera.AutoFocusCallback);
     method public final void cancelAutoFocus();
+    method public final boolean enableShutterSound(boolean);
     method public static void getCameraInfo(int, android.hardware.Camera.CameraInfo);
     method public static int getNumberOfCameras();
     method public android.hardware.Camera.Parameters getParameters();

core/java/android/hardware/Camera.java

@@ -1166,7 +1166,6 @@ public final void takePicture(ShutterCallback shutter, PictureCallback raw,
      *         system shutter sound will play when a picture is taken.
      * @see #takePicture
      * @see ShutterCallback
-     * @hide
      */
     public native final boolean enableShutterSound(boolean enabled);