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

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

Merge \\"N MR1 is API 25\\" into nyc-mr1-dev am: c9099d1a 

am: 92b73c65

Change-Id: I843e1f4b894f06736fe5288f0e12c79a10455519
parents 38d40a5c 92b73c65

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -28390,6 +28390,7 @@ package android.os { 
    field public static final int LOLLIPOP_MR1 = 22; // 0x16

    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

  }















  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








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













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















    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















  }





























  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








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













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















    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















  }





























  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








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













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















         */















        public static final int N = 24;



























        /**













         * N MR1: Still ¯\_(シ)_/¯.













         */













        public static final int N_MR1 = 25;















    }































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

































core/res/res/values/public.xml



+9
−10






























Original line number
Diff line number
Diff line








@@ -2732,15 +2732,14 @@













       Resources added in version N MR1 of the platform















       =============================================================== -->















    <eat-comment />













    <public type="attr" name="shortcutId" />













    <public type="attr" name="shortcutShortLabel" />













    <public type="attr" name="shortcutLongLabel" />













    <public type="attr" name="shortcutDisabledMessage" />













    <public type="attr" name="roundIcon" />



























    <public type="attr" name="contextUri" />













    <public type="attr" name="contextDescription" />













    <public type="attr" name="showMetadataInPreview" />













    <public type="attr" name="colorSecondary" />













    <public type="attr" name="shortcutId" id="0x01010528" />













    <public type="attr" name="shortcutShortLabel" id="0x01010529" />













    <public type="attr" name="shortcutLongLabel" id="0x0101052a" />













    <public type="attr" name="shortcutDisabledMessage" id="0x0101052b" />













    <public type="attr" name="roundIcon" id="0x0101052c" />













    <public type="attr" name="contextUri" id="0x0101052d" />













    <public type="attr" name="contextDescription" id="0x0101052e" />













    <public type="attr" name="showMetadataInPreview" id="0x0101052f" />













    <public type="attr" name="colorSecondary" id="0x01010530" />































</resources>