summaryrefslogtreecommitdiffstats
path: root/core/java
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2009-11-12 23:06:58 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2009-11-12 23:06:58 -0800
commit1ca191c2f7eb2be53d0f96117784ecafd888da73 (patch)
treec2f97a5251f22c326462ca9b66715c79d58be516 /core/java
parent4834887e6cb7a69c7a63d939d6706bd52a0e5bfa (diff)
parent1778776cf1349a5f275945c53edcd1454d58639c (diff)
downloadframeworks_base-1ca191c2f7eb2be53d0f96117784ecafd888da73.zip
frameworks_base-1ca191c2f7eb2be53d0f96117784ecafd888da73.tar.gz
frameworks_base-1ca191c2f7eb2be53d0f96117784ecafd888da73.tar.bz2
am 1778776c: Fix issue #2258571: Fix build versions
Merge commit '1778776cf1349a5f275945c53edcd1454d58639c' into eclair-mr2 * commit '1778776cf1349a5f275945c53edcd1454d58639c': Fix issue #2258571: Fix build versions
Diffstat (limited to 'core/java')
-rw-r--r--core/java/android/os/Build.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/os/Build.java b/core/java/android/os/Build.java
index d4aaba3..ee18e88 100644
--- a/core/java/android/os/Build.java
+++ b/core/java/android/os/Build.java
@@ -158,9 +158,9 @@ public class Build {
public static final int ECLAIR = 5;
/**
- * Current work on Eclair MR1.
+ * December 2009: Android 2.0.1
*/
- public static final int ECLAIR_MR1 = 6;
+ public static final int ECLAIR_0_1 = 6;
}
/** The type of build, like "user" or "eng". */