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

Commit 655ab3f5 authored by Ian Pedowitz's avatar Ian Pedowitz Committed by Android (Google) Code Review
Browse files

Merge "Revert "Revert "O is API 26""" into oc-dev

parents a1119607 967869d0

api/current.txt

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

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

  }















  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








@@ -33215,7 +33215,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













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















  }





























  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








@@ -30614,7 +30614,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













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















  }





























  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








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













        /**















         * O.















         */













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













        public static final int O = 26;















    }































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