From 43ec62af45bb286dcc1e79afba7475aafb5ceb84 Mon Sep 17 00:00:00 2001 From: Adam Powell Date: Wed, 25 May 2016 16:36:41 -0700 Subject: [PATCH] N is API 24 Change-Id: Ifea71ccff96c3c70f9f3e60ecdcb2b56af82bb08 --- api/current.txt | 2 +- api/system-current.txt | 2 +- api/test-current.txt | 2 +- core/java/android/os/Build.java | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/api/current.txt b/api/current.txt index 70ea1c577134e..21073696fc75b 100644 --- a/api/current.txt +++ b/api/current.txt @@ -28267,7 +28267,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 { diff --git a/api/system-current.txt b/api/system-current.txt index a6f612d195bf6..31661d259ecd2 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -30706,7 +30706,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 { diff --git a/api/test-current.txt b/api/test-current.txt index 37bc7afb69ef1..69b6984d6e836 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -28336,7 +28336,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 { diff --git a/core/java/android/os/Build.java b/core/java/android/os/Build.java index 7e1fc1539d72d..dc7be6b5ad613 100644 --- a/core/java/android/os/Build.java +++ b/core/java/android/os/Build.java @@ -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". */