diff options
| author | Dianne Hackborn <hackbod@google.com> | 2011-11-02 18:42:39 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-11-02 18:42:39 +0000 |
| commit | caf58b1f5c6cecd75e18d2251b3e1da2db0189e5 (patch) | |
| tree | 58c9b74ef017f86abb84087a1c222ddf4496facc /core | |
| parent | 1da83b810ab70baff32141ace168c10ec548b3fe (diff) | |
| parent | 0c8f79dd01366a45b255584ef279e498741728e4 (diff) | |
| download | build-caf58b1f5c6cecd75e18d2251b3e1da2db0189e5.zip build-caf58b1f5c6cecd75e18d2251b3e1da2db0189e5.tar.gz build-caf58b1f5c6cecd75e18d2251b3e1da2db0189e5.tar.bz2 | |
am 0c8f79dd: am 1b601a44: Merge "MR1 is version 4.1, API 15." into ics-mr1
* commit '0c8f79dd01366a45b255584ef279e498741728e4':
MR1 is version 4.1, API 15.
Diffstat (limited to 'core')
| -rw-r--r-- | core/version_defaults.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/version_defaults.mk b/core/version_defaults.mk index 6773635..7f6db0c 100644 --- a/core/version_defaults.mk +++ b/core/version_defaults.mk @@ -41,7 +41,7 @@ ifeq "" "$(PLATFORM_VERSION)" # which is the version that we reveal to the end user. # Update this value when the platform version changes (rather # than overriding it somewhere else). Can be an arbitrary string. - PLATFORM_VERSION := 4.0.1 + PLATFORM_VERSION := 4.1 endif ifeq "" "$(PLATFORM_SDK_VERSION)" @@ -53,7 +53,7 @@ ifeq "" "$(PLATFORM_SDK_VERSION)" # intermediate builds). During development, this number remains at the # SDK version the branch is based on and PLATFORM_VERSION_CODENAME holds # the code-name of the new development work. - PLATFORM_SDK_VERSION := 14 + PLATFORM_SDK_VERSION := 15 endif ifeq "" "$(PLATFORM_VERSION_CODENAME)" |