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

Commit eadbcd33 authored by Dianne Hackborn's avatar Dianne Hackborn
Browse files

resolved conflicts for merge of 8c3cb811 to master 

Change-Id: I1cd4186b6b2dcb3d1d7d21c346384dbcc6e6a8df
parents e11d9ed3 8c3cb811

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -16767,7 +16767,7 @@ package android.os { 
    field public static final int ICE_CREAM_SANDWICH_MR1 = 15; // 0xf

    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 JELLY_BEAN_MR2 = 18; // 0x12

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

  }

























core/java/android/os/Build.java



+2
−2






























Original line number
Diff line number
Diff line








@@ -433,9 +433,9 @@ public class Build {













        public static final int JELLY_BEAN_MR1 = 17;































        /**













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













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















         */













        public static final int JELLY_BEAN_MR2 = CUR_DEVELOPMENT;













        public static final int JELLY_BEAN_MR2 = 18;































        /**















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