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

Merge "Revert "Revert "O is API 26""" into oc-dev

Browse Source 
am: 655ab3f59b

Change-Id: I28655c728468f2348b2ba83b77f2aae3d7b22c06
This commit is contained in:
Ian Pedowitz
2017-05-16 04:02:51 +00:00
committed by android-build-merger
parent 9ebb128c40 655ab3f59b
commit b6290ff39e
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

@@ -30505,7 +30505,7 @@ package android.os {
field public static final int M = 23; // 0x17 field public static final int M = 23; // 0x17
field public static final int N = 24; // 0x18 field public static final int N = 24; // 0x18
field public static final int N_MR1 = 25; // 0x19 field public static final int N_MR1 = 25; // 0x19
field public static final int O = 10000; // 0x2710 field public static final int O = 26; // 0x1a
} }
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

@@ -33215,7 +33215,7 @@ package android.os {
field public static final int M = 23; // 0x17 field public static final int M = 23; // 0x17
field public static final int N = 24; // 0x18 field public static final int N = 24; // 0x18
field public static final int N_MR1 = 25; // 0x19 field public static final int N_MR1 = 25; // 0x19
field public static final int O = 10000; // 0x2710 field public static final int O = 26; // 0x1a
} }
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

@@ -30614,7 +30614,7 @@ package android.os {
field public static final int M = 23; // 0x17 field public static final int M = 23; // 0x17
field public static final int N = 24; // 0x18 field public static final int N = 24; // 0x18
field public static final int N_MR1 = 25; // 0x19 field public static final int N_MR1 = 25; // 0x19
field public static final int O = 10000; // 0x2710 field public static final int O = 26; // 0x1a
} }
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

@@ -758,7 +758,7 @@ public class Build {
/** /**
* O. * O.
*/ */
public static final int O = CUR_DEVELOPMENT; // STOPSHIP Replace with the real version. public static final int O = 26;
} }
/** The type of build, like "user" or "eng". */ /** The type of build, like "user" or "eng". */