diff --git a/api/current.txt b/api/current.txt
index 81abd5f859597..8f9e47b809eb4 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -11013,8 +11013,8 @@ package android.media {
     field public static final int INFO_TRY_AGAIN_LATER = -1; // 0xffffffff
     field public static final int MODE_AES_CTR = 1; // 0x1
     field public static final int MODE_UNENCRYPTED = 0; // 0x0
+    field public static final int VIDEO_SCALING_MODE_SCALE_TO_FIT = 1; // 0x1
     field public static final int VIDEO_SCALING_MODE_SCALE_TO_FIT_WITH_CROPPING = 2; // 0x2
-    field public static final int VIDEO_SCALING_MODE_STRETCH_TO_FIT = 1; // 0x1
   }
 
   public static final class MediaCodec.BufferInfo {
diff --git a/media/java/android/media/MediaCodec.java b/media/java/android/media/MediaCodec.java
index ab8f88439964e..bbdbf2e199220 100644
--- a/media/java/android/media/MediaCodec.java
+++ b/media/java/android/media/MediaCodec.java
@@ -443,7 +443,7 @@ final public class MediaCodec {
     }
 
     /** The content is scaled to the surface dimensions */
-    public static final int VIDEO_SCALING_MODE_STRETCH_TO_FIT             = 1;
+    public static final int VIDEO_SCALING_MODE_SCALE_TO_FIT               = 1;
 
     /** The content is scaled, maintaining its aspect ratio, the whole
         surface area is used, content may be cropped
@@ -451,7 +451,7 @@ final public class MediaCodec {
     public static final int VIDEO_SCALING_MODE_SCALE_TO_FIT_WITH_CROPPING = 2;
 
     /** If a surface has been specified in a previous call to {@link #configure}
-        specifies the scaling mode to use. The default is "stretch to fit".
+        specifies the scaling mode to use. The default is "scale to fit".
     */
     public native final void setVideoScalingMode(int mode);