diff options
| author | Dianne Hackborn <hackbod@google.com> | 2013-04-23 03:51:40 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-04-23 03:51:40 -0700 |
| commit | 8c3cb8111a5aff8a3f71942dda3020dbec285e27 (patch) | |
| tree | fa504e9af5723ba08cb43e67b7afe04f7625c2ee /core/java | |
| parent | 089a75be5e33e13071754a727902224b6db60168 (diff) | |
| parent | a4629b0b833f78481ca51baa44b0303ebe647a7c (diff) | |
am a4629b0b: Merge "JB MR2 == API 18." into jb-mr2-dev
* commit 'a4629b0b833f78481ca51baa44b0303ebe647a7c':
JB MR2 == API 18.
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/os/Build.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/os/Build.java b/core/java/android/os/Build.java index 97ac8626113b..6c9f2d1d0728 100644 --- a/core/java/android/os/Build.java +++ b/core/java/android/os/Build.java @@ -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". */ |