Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 98f6af0e authored by Colin Cross's avatar Colin Cross Committed by Automerger Merge Worker
Browse files

Merge "Rename VERSION_CODES.T to VERSION_CODES.TIRAMISU" into sc-dev-plus-aosp am: 3a873acf 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15304989

Change-Id: I71bd32519b13efa53456ef1839f5ccb03dc25229
parents 8ed59ebb 3a873acf

core/api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -30820,7 +30820,7 @@ package android.os { 
    field public static final int Q = 29; // 0x1d

    field public static final int R = 30; // 0x1e

    field public static final int S = 31; // 0x1f

    field public static final int T = 10000; // 0x2710

    field public static final int TIRAMISU = 10000; // 0x2710

  }















  public final class Bundle extends android.os.BaseBundle implements java.lang.Cloneable android.os.Parcelable {

























core/java/android/os/Build.java



+2
−2




























Original line number
Diff line number
Diff line








@@ -1132,9 +1132,9 @@ public class Build {













        public static final int S = 31;































        /**













         * T.













         * Tiramisu.















         */













        public static final int T = CUR_DEVELOPMENT;













        public static final int TIRAMISU = CUR_DEVELOPMENT;















    }































    /** The type of build, like "user" or "eng". */