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

Commit 800af77f authored by Michael Wright's avatar Michael Wright Committed by android-build-merger
Browse files

Merge "O MR1 is API 27" into oc-mr1-dev 

am: d489d122

Change-Id: I7e4e4a710ce874502b1e749a9892e46619a988df
parents 46748d50 d489d122

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -30649,7 +30649,7 @@ package android.os { 
    field public static final int N = 24; // 0x18

    field public static final int N_MR1 = 25; // 0x19

    field public static final int O = 26; // 0x1a

    field public static final int O_MR1 = 10000; // 0x2710

    field public static final int O_MR1 = 27; // 0x1b

  }















  public final class Bundle extends android.os.BaseBundle implements java.lang.Cloneable android.os.Parcelable {

























api/system-current.txt



+1
−1




























Original line number
Diff line number
Diff line








@@ -33363,7 +33363,7 @@ package android.os {













    field public static final int N = 24; // 0x18















    field public static final int N_MR1 = 25; // 0x19















    field public static final int O = 26; // 0x1a













    field public static final int O_MR1 = 10000; // 0x2710













    field public static final int O_MR1 = 27; // 0x1b















  }





























  public final class Bundle extends android.os.BaseBundle implements java.lang.Cloneable android.os.Parcelable {

























api/test-current.txt



+1
−1




























Original line number
Diff line number
Diff line








@@ -30793,7 +30793,7 @@ package android.os {













    field public static final int N = 24; // 0x18















    field public static final int N_MR1 = 25; // 0x19















    field public static final int O = 26; // 0x1a













    field public static final int O_MR1 = 10000; // 0x2710













    field public static final int O_MR1 = 27; // 0x1b















  }





























  public final class Bundle extends android.os.BaseBundle implements java.lang.Cloneable android.os.Parcelable {

























core/java/android/os/Build.java



+1
−1




























Original line number
Diff line number
Diff line








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













        /**















         * O MR1.















         */













        public static final int O_MR1 = CUR_DEVELOPMENT; // STOPSHIP Replace with the real version.













        public static final int O_MR1 = 27;















    }































    /** The type of build, like "user" or "eng". */

































tools/aapt/SdkConstants.h



+1
−1




























Original line number
Diff line number
Diff line








@@ -42,7 +42,7 @@ enum {













    SDK_NOUGAT = 24,















    SDK_NOUGAT_MR1 = 25,















    SDK_O = 26,













    SDK_O_MR1 = 10000, // STOPSHIP Replace with the real version.













    SDK_O_MR1 = 27,















};































#endif // H_AAPT_SDK_CONSTANTS