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

Commit 13792057 authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android Git Automerger
Browse files

am 7e900cbf: Merge "Update build version information." into gingerbread 

Merge commit '7e900cbf' into gingerbread-plus-aosp

* commit '7e900cbf':
  Update build version information.
parents 814f430c 7e900cbf

api/current.xml

+0 −11
Original line number Diff line number Diff line
@@ -117454,17 +117454,6 @@ 
 visibility="public"

>

</field>

<field name="KRAKEN"

 type="int"

 transient="false"

 volatile="false"

 value="10000"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

</class>

<class name="Bundle"

 extends="java.lang.Object"

core/java/android/os/Build.java

+14 −2
Original line number Diff line number Diff line
@@ -179,10 +179,22 @@ public class Build { 
         */

        public static final int ECLAIR_MR1 = 7;

        

        /**

         * June 2010: Android 2.2

         */

        public static final int FROYO = 8;

        

        public static final int KRAKEN = CUR_DEVELOPMENT;

        

        /**

         * Next version of Android.

         * 

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

         * new changes in behavior:</p>

         * <ul>

         * <li> The status bar is now dark.  Targeting this version allows

         * the platform to perform performing compatibility on status bar

         * graphics to ensure they look okay on a dark background.

         * </ul>

         */

        public static final int GINGERBREAD = CUR_DEVELOPMENT;

    }