From 967869d0edd11c75a31905ed2f6774391d85d1e4 Mon Sep 17 00:00:00 2001
From: Ian Pedowitz <ijpedowitz@google.com>
Date: Thu, 4 May 2017 00:10:04 +0000
Subject: [PATCH] Revert "Revert "O is API 26""

This reverts commit 12025857cdbf9083a9ddcc834ec0d3837bcbfe0b.

Bug: 37480230
Bug: 37355569
Change-Id: I315b8c18a79d0dcd6be84c3d2af120b073144a9e
---
 api/current.txt                 | 2 +-
 api/system-current.txt          | 2 +-
 api/test-current.txt            | 2 +-
 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 899381bec02dd..157a72c47f050 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 = 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 {
diff --git a/api/system-current.txt b/api/system-current.txt
index 8aa6c362480db..110d1dd596615 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 = 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 {
diff --git a/api/test-current.txt b/api/test-current.txt
index 944a35078e517..ef2fce7afc827 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 = 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 {
diff --git a/core/java/android/os/Build.java b/core/java/android/os/Build.java
index 86fcfc8fb961b..4bad7ab76be65 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 = CUR_DEVELOPMENT; // STOPSHIP Replace with the real version.
+        public static final int O = 26;
     }
 
     /** The type of build, like "user" or "eng". */