diff options
| author | 2017-05-04 00:07:05 +0000 | |
|---|---|---|
| committer | 2017-05-04 00:07:10 +0000 | |
| commit | b42b9a22dff69d36a87cb1494ea72f7c20610106 (patch) | |
| tree | 2291e87359bb2f4858ba0b315ac7e836aa71c6d3 | |
| parent | b3af9b7eb77a385f4bea5f99aad2d0e96f9cbc26 (diff) | |
| parent | 12025857cdbf9083a9ddcc834ec0d3837bcbfe0b (diff) | |
Merge "Revert "O is API 26"" into oc-dev
| -rw-r--r-- | api/current.txt | 2 | ||||
| -rw-r--r-- | api/system-current.txt | 2 | ||||
| -rw-r--r-- | api/test-current.txt | 2 | ||||
| -rw-r--r-- | 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 157a72c47f05..899381bec02d 100644 --- a/api/current.txt +++ b/api/current.txt @@ -30508,7 +30508,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 110d1dd59661..8aa6c362480d 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -33218,7 +33218,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 ef2fce7afc82..944a35078e51 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -30617,7 +30617,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". */ |