| commit | 25e0174290c2546d3360b7f10020076701f6c3d7 | [log] [tgz] |
|---|---|---|
| author | Anton Hansson <hansson@google.com> | Sat May 01 15:33:48 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat May 01 15:33:48 2021 +0000 |
| tree | f9d46dea5a0a7a40dc750f70d475d25332fd7283 | |
| parent | 391f46c197c5819bd01cd454a3bca8ca05bc3d88 [diff] | |
| parent | c5dfd7668d478fd3978f84548032968a7a1e7ec4 [diff] |
Merge changes I11fb4448,Ibdb2f1ba am: 8eed4db749 am: 8291db5462 am: c5dfd7668d Original change: https://android-review.googlesource.com/c/platform/packages/modules/SdkExtensions/+/1687967 Change-Id: I655de2b32cc3701f6af0ac853c078118d2ee6c15
diff --git a/framework/java/android/os/ext/SdkExtensions.java b/framework/java/android/os/ext/SdkExtensions.java index f36a3f6..514daf5 100644 --- a/framework/java/android/os/ext/SdkExtensions.java +++ b/framework/java/android/os/ext/SdkExtensions.java
@@ -43,7 +43,7 @@ public class SdkExtensions { // S_VERSION_CODE is a separate field to simplify management across branches. - private static final int VERSION_CODE_S = VERSION_CODES.CUR_DEVELOPMENT; + private static final int VERSION_CODE_S = VERSION_CODES.S; private static final int R_EXTENSION_INT; private static final int S_EXTENSION_INT; private static final Map<Integer, Integer> ALL_EXTENSION_INTS;
diff --git a/manifest.json b/manifest.json index deeb29e..7c089da 100644 --- a/manifest.json +++ b/manifest.json
@@ -1,4 +1,4 @@ { "name": "com.android.sdkext", - "version": 300000000 + "version": 309999900 }