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

Commit 047f3c71 authored by Jeff Brown's avatar Jeff Brown
Browse files

resolved conflicts for merge of 3ee9dc58 to master 

Change-Id: Idd045d01246367b77718210c8b6665110da58ac4
parents 2adb4229 3ee9dc58

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -19102,6 +19102,7 @@ package android.os { 
    field public static final int JELLY_BEAN_MR1 = 17; // 0x11

    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 = 10000; // 0x2710

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

  }

























core/java/android/os/Build.java



+5
−0




























Original line number
Diff line number
Diff line








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













         */















        public static final int KITKAT = 19;





























        /**













         * Android 4.5: KitKat for watches, snacks on the run.













         */













        public static final int KITKAT_WATCH = CUR_DEVELOPMENT; // STOPSHIP: update API level





























        /**















         * L!















         *