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

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

Merge "Welcome, Key Lime Pie."

parents 0e051852 5d2bfa16

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -15852,6 +15852,7 @@ package android.os { 
    field public static final int JELLY_BEAN = 16; // 0x10

    field public static final int JELLY_BEAN_MR1 = 17; // 0x11

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

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

  }















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

























core/java/android/os/Build.java



+5
−0






























Original line number
Diff line number
Diff line








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













         * Android 4.X: Jelly Bean MR2, the revenge of the beans.















         */















        public static final int JELLY_BEAN_MR2 = CUR_DEVELOPMENT;



























        /**













         * Android X.X: Key Lime Pie, another tasty treat.













         */













        public static final int KEY_LIME_PIE = CUR_DEVELOPMENT;















    }















    















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