commit 62e5b87abbcf711c53fe7553b6547616732df2c5
author Ian Pedowitz <ijpedowitz@google.com> Wed May 03 22:00:56 2017 +0000
committer gitbuildkicker <android-build@google.com> Wed May 03 19:27:41 2017 -0700
tree 468fbf756b79a0b25b6ad6d84aa251b60f65ab06
parent d3de8e07507e24dc4a080a46cb8f5a7a129bf77d

Revert "O is API 26"

This reverts commit 9bcef8e2da32ba959b61a0b400adfe9fde1a2a10.

Reason for revert:  b/37355569

Bug: 37480230
Bug: 37355569
Change-Id: I39b4a7fd9bda77df0746c7bc32b87f0c2b722f2b
(cherry picked from commit 12025857cdbf9083a9ddcc834ec0d3837bcbfe0b)

api/current.txt

diff --git a/api/current.txt b/api/current.txt
index 157a72c..899381b 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -30508,7 +30508,7 @@
     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 {

api/system-current.txt

diff --git a/api/system-current.txt b/api/system-current.txt
index 110d1dd..8aa6c36 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -33218,7 +33218,7 @@
     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 {

api/test-current.txt

diff --git a/api/test-current.txt b/api/test-current.txt
index ef2fce7..944a350 100644
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -30617,7 +30617,7 @@
     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 {

core/java/android/os/Build.java

diff --git a/core/java/android/os/Build.java b/core/java/android/os/Build.java
index 4bad7ab..86fcfc8 100644
--- a/core/java/android/os/Build.java
+++ b/core/java/android/os/Build.java
@@ -758,7 +758,7 @@
         /**
          * 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". */