N MR1 is API 25

Also, finalize resource IDs for N MR1

Bug: 29816674
Change-Id: Ie880adb2544f4e2e32b439fe975a68a3928e6fe5
diff --git a/api/current.txt b/api/current.txt
index 0323098f..b9c0269 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -28371,6 +28371,7 @@
     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 {
diff --git a/api/system-current.txt b/api/system-current.txt
index aa1d74c..9d07e84 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -30851,6 +30851,7 @@
     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 {
diff --git a/api/test-current.txt b/api/test-current.txt
index d904415..1906c5e 100644
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -28441,6 +28441,7 @@
     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 {
diff --git a/core/java/android/os/Build.java b/core/java/android/os/Build.java
index dc7be6b..c5e09bd 100644
--- a/core/java/android/os/Build.java
+++ b/core/java/android/os/Build.java
@@ -672,6 +672,11 @@
          * 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". */
diff --git a/core/res/res/values/public.xml b/core/res/res/values/public.xml
index 9ccd39f..77de87d 100644
--- a/core/res/res/values/public.xml
+++ b/core/res/res/values/public.xml
@@ -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>