am 46ad7961: Unhide cancelAutoFocus API in Camera.

Merge commit '46ad796186bdca8bac75607340aa0fac0c34a9d8' into eclair-plus-aosp

* commit '46ad796186bdca8bac75607340aa0fac0c34a9d8':
  Unhide cancelAutoFocus API in Camera.

api/current.xml

@@ -66999,6 +66999,17 @@
 <parameter name="cb" type="android.hardware.Camera.AutoFocusCallback">
 </parameter>
 </method>
+<method name="cancelAutoFocus"
+ return="void"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
 <method name="getParameters"
  return="android.hardware.Camera.Parameters"
  abstract="false"

core/java/android/hardware/Camera.java

@@ -387,7 +387,6 @@ public class Camera {
      * this function will cancel it. Whether the auto-focus is in progress
      * or not, this function will return the focus position to the default.
      * If the camera does not support auto-focus, this is a no-op.
-     * @hide
      */
     public final void cancelAutoFocus()
     {