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

Commit c96a3583 authored by Ian Pedowitz's avatar Ian Pedowitz Committed by android-build-merger
Browse files

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

am: b42b9a22

Change-Id: Ic869f9f6f627c960222cb5364e04e6f4491c0a88
parents cd194433 b42b9a22

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -30508,7 +30508,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 = 26; // 0x1a

    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
−1




























Original line number
Diff line number
Diff line








@@ -33218,7 +33218,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 = 26; // 0x1a













    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
−1




























Original line number
Diff line number
Diff line








@@ -30617,7 +30617,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 = 26; // 0x1a













    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



+1
−1




























Original line number
Diff line number
Diff line








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













        /**















         * O.















         */













        public static final int O = 26;













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















    }































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