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

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

Merge "resolved conflicts for merge of ec85619f to master"

parents 3e8abfdf 39cf8c97

api/13.xml

0 → 100644
+462056 −0

File added.

File size exceeds preview limit.

View file

api/13.txt→api/14.txt

+0 −0

File moved.

View file

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -13354,6 +13354,7 @@ package android.os { 
    field public static final int GINGERBREAD_MR1 = 10; // 0xa

    field public static final int HONEYCOMB = 11; // 0xb

    field public static final int HONEYCOMB_MR1 = 12; // 0xc

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

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

  }

























core/java/android/os/Build.java



+6
−1






























Original line number
Diff line number
Diff line







@@ -227,10 +227,15 @@ public class Build {







        public static final int HONEYCOMB = 11;









        









        /**









         * Newest version of Android, version 3.1.









         * May 2011: Android 3.1.









         */









        public static final int HONEYCOMB_MR1 = 12;









        









        /**









         * Current development version.









         */









        public static final int HONEYCOMB_MR2 = CUR_DEVELOPMENT;



















        /**









         * Current version under development.









         */