am 571529f8: am d94ed379: Merge change I1dc2ae28 into eclair

Merge commit '571529f82159a3205547a61d1b720b695dc066be' into eclair-mr2-plus-aosp

* commit '571529f82159a3205547a61d1b720b695dc066be':
  Fix bug 2242585 to unhide the new audio recording sources.

api/current.xml

@@ -79701,6 +79701,17 @@
  deprecated="not deprecated"
  visibility="public"
 >
+<field name="CAMCORDER"
+ type="int"
+ transient="false"
+ volatile="false"
+ value="5"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
 <field name="DEFAULT"
  type="int"
  transient="false"
@@ -79745,6 +79756,17 @@
  visibility="public"
 >
 </field>
+<field name="VOICE_RECOGNITION"
+ type="int"
+ transient="false"
+ volatile="false"
+ value="6"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
 <field name="VOICE_UPLINK"
  type="int"
  transient="false"

media/java/android/media/MediaRecorder.java

@@ -136,10 +136,10 @@ public class MediaRecorder
         /** Voice call uplink + downlink audio source */
         public static final int VOICE_CALL = 4;
 
-        /** @hide Microphone audio source with same orientation as camera */
+        /** Microphone audio source with same orientation as camera */
         public static final int CAMCORDER = 5;
 
-        /** @hide Microphone audio source tuned for voice recognition */
+        /** Microphone audio source tuned for voice recognition */
         public static final int VOICE_RECOGNITION = 6;
     }