diff --git a/api/current.txt b/api/current.txt
index dc0802d..26e4298 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -32190,7 +32190,7 @@
     field public static final int N_MR1 = 25; // 0x19
     field public static final int O = 26; // 0x1a
     field public static final int O_MR1 = 27; // 0x1b
-    field public static final int P = 10000; // 0x2710
+    field public static final int P = 28; // 0x1c
   }
 
   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 7162b8a..2de07b5 100644
--- a/core/java/android/os/Build.java
+++ b/core/java/android/os/Build.java
@@ -911,7 +911,7 @@
          * even if there is no excess space.</li>
          * </ul>
          */
-        public static final int P = CUR_DEVELOPMENT; // STOPSHIP Replace with the real version.
+        public static final int P = 28;
     }
 
     /** The type of build, like "user" or "eng". */
diff --git a/tools/aapt/SdkConstants.h b/tools/aapt/SdkConstants.h
index b982d0d..c1fcf5c 100644
--- a/tools/aapt/SdkConstants.h
+++ b/tools/aapt/SdkConstants.h
@@ -43,7 +43,7 @@
     SDK_NOUGAT_MR1 = 25,
     SDK_O = 26,
     SDK_O_MR1 = 27,
-    SDK_P = 10000, // STOPSHIP Replace with the real version.
+    SDK_P = 28,
 };
 
 #endif // H_AAPT_SDK_CONSTANTS
diff --git a/tools/aapt2/SdkConstants.h b/tools/aapt2/SdkConstants.h
index 5b7be3b..9fa29f2 100644
--- a/tools/aapt2/SdkConstants.h
+++ b/tools/aapt2/SdkConstants.h
@@ -53,7 +53,7 @@
   SDK_NOUGAT_MR1 = 25,
   SDK_O = 26,
   SDK_O_MR1 = 27,
-  SDK_P = 10000, // STOPSHIP Replace with the real version.
+  SDK_P = 28,
 };
 
 ApiVersion FindAttributeSdkLevel(const ResourceId& id);