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

Commit 0b478d5b authored by Adam Powell's avatar Adam Powell Committed by android-build-merger
Browse files

Merge "N is API 24" into nyc-dev 

am: bc983c44

* commit 'bc983c44':
  N is API 24

Change-Id: Ib90f6e51c793d1cb61f806196b93736edf2014d8
parents 3d09accb bc983c44

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -28268,7 +28268,7 @@ package android.os { 
    field public static final int LOLLIPOP = 21; // 0x15

    field public static final int LOLLIPOP_MR1 = 22; // 0x16

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

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

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

  }















  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








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













    field public static final int LOLLIPOP = 21; // 0x15















    field public static final int LOLLIPOP_MR1 = 22; // 0x16















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













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













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















  }





























  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








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













    field public static final int LOLLIPOP = 21; // 0x15















    field public static final int LOLLIPOP_MR1 = 22; // 0x16















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













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













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















  }





























  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








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













        /**















         * N is for ¯\_(ツ)_/¯.















         */













        public static final int N = CUR_DEVELOPMENT;













        public static final int N = 24;















    }































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