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

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

Merge "Add API level for MR1." into lmp-mr1-dev

parents 6daac003 3b696887

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -21401,6 +21401,7 @@ package android.os { 
    field public static final int KITKAT_WATCH = 20; // 0x14

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

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

    field public static final int LOLLIPOP_MR1 = 22; // 0x16

  }















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

























core/java/android/os/Build.java



+5
−0




























Original line number
Diff line number
Diff line








@@ -569,6 +569,11 @@ public class Build {













         * </ul>















         */















        public static final int LOLLIPOP = 21;



























        /**













         * Lollipop with an extra sugar coating on the outside!













         */













        public static final int LOLLIPOP_MR1 = 22;















    }















    















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