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

Commit 4c9108ca authored by Jeff Sharkey's avatar Jeff Sharkey Committed by android-build-merger
Browse files

Merge "Q." 

am: 20cc0ef0

Change-Id: I044403f837d4cfc4d1046357e4286ab95caf9865
parents bb6b0f57 20cc0ef0

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -32229,6 +32229,7 @@ package android.os { 
    field public static final int O = 26; // 0x1a

    field public static final int O_MR1 = 27; // 0x1b

    field public static final int P = 28; // 0x1c

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

  }















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

























core/java/android/os/Build.java



+9
−0




























Original line number
Diff line number
Diff line








@@ -916,6 +916,15 @@ public class Build {













         * </ul>















         */















        public static final int P = 28;



























        /**













         * Q.













         * <p>













         * <em>Why? Why, to give you a taste of your future, a preview of things













         * to come. Con permiso, Capitan. The hall is rented, the orchestra













         * engaged. It's now time to see if you can dance.</em>













         */













        public static final int Q = CUR_DEVELOPMENT;















    }































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