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

Commit edfc6af5 authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android (Google) Code Review
Browse files

Merge "Fix issue #17375172... sshhhhhh!!!" into lmp-dev

parents 649db7f0 521e4bd7

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -21563,7 +21563,7 @@ package android.os { 
    field public static final int JELLY_BEAN_MR2 = 18; // 0x12

    field public static final int KITKAT = 19; // 0x13

    field public static final int KITKAT_WATCH = 20; // 0x14

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

    field public static final int L = 21; // 0x15

  }















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

























core/java/android/os/Build.java



+1
−1






























Original line number
Diff line number
Diff line








@@ -541,7 +541,7 @@ public class Build {













         * Intent.</li>















         * </ul>















         */













        public static final int L = CUR_DEVELOPMENT;













        public static final int L = 21;















    }















    















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