Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Dianne Hackborn
2013-04-22 23:37:37 +00:00
committed by Android (Google) Code Review
parent a7b2625d43 d2eeed635d
commit a4629b0b83
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/current.txt
View File

@@ -16760,7 +16760,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
}
public final class Bundle implements java.lang.Cloneable android.os.Parcelable {

4
core/java/android/os/Build.java
View File

@@ -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;
}
/** The type of build, like "user" or "eng". */