commit a4629b0b833f78481ca51baa44b0303ebe647a7c
author Dianne Hackborn <hackbod@google.com> Mon Apr 22 23:37:37 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Apr 22 23:37:37 2013 +0000
tree 942262ec564f5a02e05b97eba390add5d9c1c2d4
parent a7b2625d43a8e83e3fb47ca261efad6e3f6fcde9
parent d2eeed635d2d7fdeeda0a1eaa6ec9e659198c45f

Merge "JB MR2 == API 18." into jb-mr2-dev

api/current.txt

diff --git a/api/current.txt b/api/current.txt
index 6769433..1ef6955 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -16760,7 +16760,7 @@
     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
   }
 
   public final class Bundle implements java.lang.Cloneable android.os.Parcelable {

core/java/android/os/Build.java

diff --git a/core/java/android/os/Build.java b/core/java/android/os/Build.java
index 97ac862..6c9f2d1 100644
--- a/core/java/android/os/Build.java
+++ b/core/java/android/os/Build.java
@@ -433,9 +433,9 @@
         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;
     }
     
     /** The type of build, like "user" or "eng". */