diff options
| author | Dianne Hackborn <hackbod@google.com> | 2009-10-29 01:20:01 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-10-29 01:20:01 -0700 |
| commit | 40946aa20183984fd60f2dbdc7708cf1c5431047 (patch) | |
| tree | 61412a0c6f2f7f4598956d9b264c80b4368f0785 /core/java/android/os | |
| parent | f5633bc7e2fddbd1104d129b9d55d74fa8c2666b (diff) | |
| parent | 1f668fff8ad2b8d79d42da5d9667d308fa0b9441 (diff) | |
| download | frameworks_base-40946aa20183984fd60f2dbdc7708cf1c5431047.zip frameworks_base-40946aa20183984fd60f2dbdc7708cf1c5431047.tar.gz frameworks_base-40946aa20183984fd60f2dbdc7708cf1c5431047.tar.bz2 | |
am 1f668fff: Merge change Idb13ed9a into eclair
Merge commit '1f668fff8ad2b8d79d42da5d9667d308fa0b9441' into eclair-mr2
* commit '1f668fff8ad2b8d79d42da5d9667d308fa0b9441':
Add SDK version for MR1.
Diffstat (limited to 'core/java/android/os')
| -rw-r--r-- | core/java/android/os/Build.java | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/core/java/android/os/Build.java b/core/java/android/os/Build.java index 0f8bc08..d4aaba3 100644 --- a/core/java/android/os/Build.java +++ b/core/java/android/os/Build.java @@ -103,16 +103,19 @@ public class Build { * October 2008: The original, first, version of Android. Yay! */ public static final int BASE = 1; + /** * February 2009: First Android update, officially called 1.1. */ public static final int BASE_1_1 = 2; + /** * May 2009: Android 1.5. */ public static final int CUPCAKE = 3; + /** - * Current work on "Donut" development branch. + * September 2009: Android 1.6. * * <p>Applications targeting this or a later release will get these * new changes in behavior:</p> @@ -133,8 +136,9 @@ public class Build { * </ul> */ public static final int DONUT = 4; + /** - * Current work on "Eclair" development branch. + * November 2009: Android 2.0 * * <p>Applications targeting this or a later release will get these * new changes in behavior:</p> @@ -152,6 +156,11 @@ public class Build { * </ul> */ public static final int ECLAIR = 5; + + /** + * Current work on Eclair MR1. + */ + public static final int ECLAIR_MR1 = 6; } /** The type of build, like "user" or "eng". */ |