Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 67eb4320 authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android (Google) Code Review
Browse files

Merge "ICS is API 14."

parents 5eb41b01 0784cfb4

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -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



+2
−2




























Original line number
Diff line number
Diff line








@@ -277,7 +277,7 @@ public class Build {













        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 class Build {













         *      {@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". */