Merge "Replace ART's core-platform-api stub with module-lib stubs" into sc-dev
diff --git a/dalvik/src/main/java/dalvik/annotation/compat/VersionCodes.java b/dalvik/src/main/java/dalvik/annotation/compat/VersionCodes.java
index c05ce06..9d4d3fa 100644
--- a/dalvik/src/main/java/dalvik/annotation/compat/VersionCodes.java
+++ b/dalvik/src/main/java/dalvik/annotation/compat/VersionCodes.java
@@ -67,8 +67,8 @@
public static final int R = 30;
/**
- * The version code for Android S (API version TBD).
+ * The version code for Android S (API version 31).
*/
@IntraCoreApi
- public static final int S = CUR_DEVELOPMENT;
+ public static final int S = 31;
}
diff --git a/mmodules/intracoreapi/api/intra/current.txt b/mmodules/intracoreapi/api/intra/current.txt
index bc021cf..7e813f9 100644
--- a/mmodules/intracoreapi/api/intra/current.txt
+++ b/mmodules/intracoreapi/api/intra/current.txt
@@ -35,7 +35,7 @@
field @libcore.api.IntraCoreApi public static final int P = 28; // 0x1c
field @libcore.api.IntraCoreApi public static final int Q = 29; // 0x1d
field @libcore.api.IntraCoreApi public static final int R = 30; // 0x1e
- field @libcore.api.IntraCoreApi public static final int S = 10000; // 0x2710
+ field @libcore.api.IntraCoreApi public static final int S = 31; // 0x1f
}
}