summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--api/current.txt2
-rw-r--r--api/system-current.txt2
-rw-r--r--api/test-current.txt2
-rw-r--r--core/java/android/os/Build.java2
4 files changed, 4 insertions, 4 deletions
diff --git a/api/current.txt b/api/current.txt
index 6efa792c4448..2f33c34fd5b4 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -30528,7 +30528,7 @@ package android.os {
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
- field public static final int O = 26; // 0x1a
+ field public static final int O = 10000; // 0x2710
}
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 4124ad3fe462..9a62752c79e1 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -33245,7 +33245,7 @@ package android.os {
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
- field public static final int O = 26; // 0x1a
+ field public static final int O = 10000; // 0x2710
}
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 a4e1866f90f0..6ea9b11aa41d 100644
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -30637,7 +30637,7 @@ package android.os {
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
- field public static final int O = 26; // 0x1a
+ field public static final int O = 10000; // 0x2710
}
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 4bad7ab76be6..86fcfc8fb961 100644
--- a/core/java/android/os/Build.java
+++ b/core/java/android/os/Build.java
@@ -758,7 +758,7 @@ public class Build {
/**
* O.
*/
- public static final int O = 26;
+ public static final int O = CUR_DEVELOPMENT; // STOPSHIP Replace with the real version.
}
/** The type of build, like "user" or "eng". */