Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: 0b478d5b05

* commit '0b478d5b052c4440a0eb8686d400d1595ead1857':
  N is API 24

Change-Id: I90b772e177cefff1071a9859f046f683411a7e59
This commit is contained in:
Adam Powell
2016-05-26 01:56:59 +00:00
committed by android-build-merger
parent 75b84a9355 0b478d5b05
commit 3579a6a634
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/current.txt
View File

@@ -28369,7 +28369,7 @@ package android.os {
field public static final int LOLLIPOP = 21; // 0x15 field public static final int LOLLIPOP = 21; // 0x15
field public static final int LOLLIPOP_MR1 = 22; // 0x16 field public static final int LOLLIPOP_MR1 = 22; // 0x16
field public static final int M = 23; // 0x17 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 { public final class Bundle extends android.os.BaseBundle implements java.lang.Cloneable android.os.Parcelable {

2
api/system-current.txt
View File

@@ -30808,7 +30808,7 @@ package android.os {
field public static final int LOLLIPOP = 21; // 0x15 field public static final int LOLLIPOP = 21; // 0x15
field public static final int LOLLIPOP_MR1 = 22; // 0x16 field public static final int LOLLIPOP_MR1 = 22; // 0x16
field public static final int M = 23; // 0x17 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 { public final class Bundle extends android.os.BaseBundle implements java.lang.Cloneable android.os.Parcelable {

2
api/test-current.txt
View File

@@ -28439,7 +28439,7 @@ package android.os {
field public static final int LOLLIPOP = 21; // 0x15 field public static final int LOLLIPOP = 21; // 0x15
field public static final int LOLLIPOP_MR1 = 22; // 0x16 field public static final int LOLLIPOP_MR1 = 22; // 0x16
field public static final int M = 23; // 0x17 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 { public final class Bundle extends android.os.BaseBundle implements java.lang.Cloneable android.os.Parcelable {

2
core/java/android/os/Build.java
View File

@@ -671,7 +671,7 @@ public class Build {
/** /**
* N is for ¯\_(ツ)_/¯. * N is for ¯\_(ツ)_/¯.
*/ */
public static final int N = CUR_DEVELOPMENT; public static final int N = 24;
} }
/** The type of build, like "user" or "eng". */ /** The type of build, like "user" or "eng". */