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

Commit 9c1202be authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Add VERSION_CODES.O"

parents 4cd3e8c0 864f4bd9

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -28490,6 +28490,7 @@ package android.os { 
    field public static final int M = 23; // 0x17

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

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

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

  }















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

























api/system-current.txt



+1
−0




























Original line number
Diff line number
Diff line








@@ -30984,6 +30984,7 @@ package android.os {













    field public static final int M = 23; // 0x17















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















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













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















  }





























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

























api/test-current.txt



+1
−0




























Original line number
Diff line number
Diff line








@@ -28564,6 +28564,7 @@ package android.os {













    field public static final int M = 23; // 0x17















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















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













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















  }





























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

























core/java/android/os/Build.java



+5
−0




























Original line number
Diff line number
Diff line








@@ -755,6 +755,11 @@ public class Build {













         * N MR1: Nougat++.















         */















        public static final int N_MR1 = 25;



























        /**













         * O.













         */













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















    }































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