Automated import from //branches/donutburger/...@140800,140800
diff --git a/media/java/android/media/AudioService.java b/media/java/android/media/AudioService.java
index f30aebe..2e3e460 100644
--- a/media/java/android/media/AudioService.java
+++ b/media/java/android/media/AudioService.java
@@ -567,7 +567,6 @@
 
     /**
      * @see #setVibrateSetting(int, int)
-     * @hide
      */
     public static int getValueForVibrateSetting(int existingValue, int vibrateType,
             int vibrateSetting) {
@@ -661,7 +660,6 @@
     }
 
     /** @see AudioManager#playSoundEffect(int, float) */
-    /* @hide FIXME: unhide before release */
     public void playSoundEffectVolume(int effectType, float volume) {
         sendMsg(mAudioHandler, MSG_PLAY_SOUND_EFFECT, SHARED_MSG, SENDMSG_NOOP,
                 effectType, (int) (volume * 1000), null, 0);