summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--api/current.txt2
-rw-r--r--core/java/android/os/Build.java4
2 files changed, 3 insertions, 3 deletions
diff --git a/api/current.txt b/api/current.txt
index a8bdaea8b709..5efa32f775c3 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -14386,7 +14386,7 @@ package android.os {
field public static final int HONEYCOMB = 11; // 0xb
field public static final int HONEYCOMB_MR1 = 12; // 0xc
field public static final int HONEYCOMB_MR2 = 13; // 0xd
- field public static final int ICE_CREAM_SANDWICH = 10000; // 0x2710
+ field public static final int ICE_CREAM_SANDWICH = 14; // 0xe
}
public final class Bundle implements java.lang.Cloneable android.os.Parcelable {
diff --git a/core/java/android/os/Build.java b/core/java/android/os/Build.java
index 1e9ee7c6544c..1d8ea123c72c 100644
--- a/core/java/android/os/Build.java
+++ b/core/java/android/os/Build.java
@@ -277,7 +277,7 @@ public class Build {
public static final int HONEYCOMB_MR2 = 13;
/**
- * Current version under development.
+ * Android 4.0.
*
* <p>Applications targeting this or a later release will get these
* new changes in behavior:</p>
@@ -298,7 +298,7 @@ public class Build {
* {@link android.R.style#Theme_DeviceDefault} family.
* </ul>
*/
- public static final int ICE_CREAM_SANDWICH = CUR_DEVELOPMENT;
+ public static final int ICE_CREAM_SANDWICH = 14;
}
/** The type of build, like "user" or "eng". */