am 1ca191c2: am 1778776c: Fix issue #2258571: Fix build versions

Merge commit '1ca191c2f7eb2be53d0f96117784ecafd888da73' into eclair-mr2-plus-aosp

* commit '1ca191c2f7eb2be53d0f96117784ecafd888da73':
  Fix issue #2258571: Fix build versions
This commit is contained in:
Dianne Hackborn
2009-11-13 09:27:04 -08:00
committed by Android Git Automerger
3 changed files with 10 additions and 1449 deletions

1453
api/6.xml

File diff suppressed because it is too large Load Diff

View File

@@ -99872,7 +99872,7 @@
visibility="public"
>
</field>
<field name="ECLAIR_MR1"
<field name="ECLAIR_0_1"
type="int"
transient="false"
volatile="false"

View File

@@ -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". */