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

Merge commit '255ba31a75d864d9c7278c9aceb542652b80d586'

* commit '255ba31a75d864d9c7278c9aceb542652b80d586':
  Fix issue #2258571: Fix build versions
This commit is contained in:
Dianne Hackborn
2009-11-13 10:51:54 -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

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