Merge "Revert "Revert "O is API 26""" into oc-dev am: 655ab3f59b

am: b6290ff39e Change-Id: If4c21c8d37d753b00e4478c21bf5e6dbe9f39288
2017-05-16 05:04:15 +00:00
parent 3435681fbc b6290ff39e
commit 52e33eed24
4 changed files with 4 additions and 4 deletions
--- a/api/current.txt
+++ b/api/current.txt
@@ -30525,7 +30525,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 = 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 {
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -33242,7 +33242,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 = 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 {
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -30635,7 +30635,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 = 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 {
--- 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 = CUR_DEVELOPMENT; // STOPSHIP Replace with the real version.
+        public static final int O = 26;
    }

    /** The type of build, like "user" or "eng". */