diff options
| author | Jeff Sharkey <jsharkey@google.com> | 2021-06-02 20:27:34 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-06-02 20:27:34 +0000 |
| commit | dbfae6ddc78b0bbb2b8e4563b3ea678d033160a8 (patch) | |
| tree | 56937f7777407eec11bf40e7219c86a94008a436 /core/java/android/os/Build.java | |
| parent | 7f0f8978ab8be28775384f155c923c4c08dbad66 (diff) | |
| parent | 77499b3231ed11dc0af6167fdcf19e3d02b44ddd (diff) | |
Merge changes from topic "may27-sdk" into sc-dev am: e6fb6087aa am: b3a4448be3 am: 77499b3231
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14749815
Change-Id: I759a5582a387d95bb13ad726817b0bcba86e841d
Diffstat (limited to 'core/java/android/os/Build.java')
| -rwxr-xr-x | core/java/android/os/Build.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/os/Build.java b/core/java/android/os/Build.java index a0343b0750bc..d7851a5d0d35 100755 --- a/core/java/android/os/Build.java +++ b/core/java/android/os/Build.java @@ -1086,7 +1086,7 @@ public class Build { /** * S. */ - public static final int S = CUR_DEVELOPMENT; + public static final int S = 31; } /** The type of build, like "user" or "eng". */ |