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

Commit fc986d71 authored by Justin Koh's avatar Justin Koh
Browse files

resolved conflicts for merge of 32c5f299 to master 

Change-Id: I72656792e109fea82c63a3a42151c024630f5997
parents 11d04154 32c5f299

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -19644,7 +19644,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 KITKAT_WATCH = 20; // 0x14

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

  }

























core/java/android/os/Build.java



+9
−2






























Original line number
Diff line number
Diff line








@@ -515,9 +515,16 @@ public class Build {













        public static final int KITKAT = 19;































        /**













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













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













         *













         * <p>Applications targeting this or a later release will get these













         * new changes in behavior:</p>













         * <ul>













         * <li>{@link android.app.AlertDialog} might not have a default background if the theme does













         * not specify one.</li>













         * </ul>















         */













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













        public static final int KITKAT_WATCH = 20;































        /**















         * L!