Merge "ICS is API 14."

Author: Dianne Hackborn

api/current.txt

@@ -14386,7 +14386,7 @@ package android.os {
     field public static final int HONEYCOMB = 11; // 0xb
     field public static final int HONEYCOMB_MR1 = 12; // 0xc
     field public static final int HONEYCOMB_MR2 = 13; // 0xd
-    field public static final int ICE_CREAM_SANDWICH = 10000; // 0x2710
+    field public static final int ICE_CREAM_SANDWICH = 14; // 0xe
   }
 
   public final class Bundle implements java.lang.Cloneable android.os.Parcelable {

core/java/android/os/Build.java

@@ -277,7 +277,7 @@ public static class VERSION_CODES {
         public static final int HONEYCOMB_MR2 = 13;
 
         /**
-         * Current version under development.
+         * Android 4.0.
          *
          * <p>Applications targeting this or a later release will get these
          * new changes in behavior:</p>
@@ -298,7 +298,7 @@ public static class VERSION_CODES {
          *      {@link android.R.style#Theme_DeviceDefault} family.
          * </ul>
          */
-        public static final int ICE_CREAM_SANDWICH = CUR_DEVELOPMENT;
+        public static final int ICE_CREAM_SANDWICH = 14;
     }
 
     /** The type of build, like "user" or "eng". */