diff options
| author | Anton Hansson <hansson@google.com> | 2021-05-11 11:02:49 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-05-11 11:02:49 +0000 |
| commit | 19e9c30ca46c9c49b51e023b1bbdbc448914adbb (patch) | |
| tree | acc3931cc89de55458b9aba10dc698abe8b70a13 /core/java/android/os/Build.java | |
| parent | c925228169ad8fdf8829943ef3417e8b7e8c8b62 (diff) | |
| parent | 822d0ac2ba3cf42ebb4abb498707f5c3fdccf190 (diff) | |
Merge "Inline two constants from CorePlatform" am: dbf1544b68 am: e3eefd6d2e am: 833e374197 am: 822d0ac2ba
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1699727
Change-Id: I2faa672e8c01056e5fe276dc871bae3211312c0c
Diffstat (limited to 'core/java/android/os/Build.java')
| -rwxr-xr-x | core/java/android/os/Build.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/core/java/android/os/Build.java b/core/java/android/os/Build.java index 8904e3d056f7..f74dee02d899 100755 --- a/core/java/android/os/Build.java +++ b/core/java/android/os/Build.java @@ -437,7 +437,8 @@ public class Build { * Magic version number for a current development build, which has * not yet turned into an official release. */ - public static final int CUR_DEVELOPMENT = VMRuntime.SDK_VERSION_CUR_DEVELOPMENT; + // This must match VMRuntime.SDK_VERSION_CUR_DEVELOPMENT. + public static final int CUR_DEVELOPMENT = 10000; /** * October 2008: The original, first, version of Android. Yay! |