commit 528a5bd466a18f2d955ae364b0e8600b74fa790f
author Adam Powell <adamp@google.com> Thu May 26 01:21:19 2016 +0000
committer android-build-merger <android-build-merger@google.com> Thu May 26 01:21:19 2016 +0000
tree 29a14e3dbd483924ee52a192befd39d8a2877cbc
parent 1f4a0d178f5eb7ee85ac36f03cf8c937e8a12dcd
parent bc983c443139c7b4605f98d56bd9ad7652a9938b

Merge "N is API 24" into nyc-dev
am: bc983c4431

* commit 'bc983c443139c7b4605f98d56bd9ad7652a9938b':
  N is API 24

Change-Id: Ic45d31eb721e9831fafd5413ce60947eb7fbad7e

api/current.txt

diff --git a/api/current.txt b/api/current.txt
index a4b69bd24..804eab2 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -28369,7 +28369,7 @@
     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

diff --git a/api/system-current.txt b/api/system-current.txt
index 174c89e..6662813 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -30808,7 +30808,7 @@
     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

diff --git a/api/test-current.txt b/api/test-current.txt
index 6ea435a..b8c6407 100644
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -28439,7 +28439,7 @@
     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

diff --git a/core/java/android/os/Build.java b/core/java/android/os/Build.java
index 7e1fc15..dc7be6b 100644
--- a/core/java/android/os/Build.java
+++ b/core/java/android/os/Build.java
@@ -671,7 +671,7 @@
         /**
          * N is for ¯\_(ツ)_/¯.
          */
-        public static final int N = CUR_DEVELOPMENT;
+        public static final int N = 24;
     }
 
     /** The type of build, like "user" or "eng". */