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

am: b42b9a22df Change-Id: Ic869f9f6f627c960222cb5364e04e6f4491c0a88
2017-05-04 00:18:19 +00:00
parent cd1944336d b42b9a22df
commit c96a358318
4 changed files with 4 additions and 4 deletions
--- 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 {
--- 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 {
--- 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 {
--- 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". */