summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2011-05-11 13:49:50 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2011-05-11 13:49:50 -0700
commit477e963276a1fb3759cbf40fc4ea1039b0d22057 (patch)
tree9f331278e0547cbcef8a39ca0472eb2a580fb5de /core
parent57a477ff2e3dc853d24ca4ce490dbc50feeca3c8 (diff)
parentea4d9f557b20e7a4ef77e6ac0c573cf3a9a5fd3a (diff)
downloadbuild-477e963276a1fb3759cbf40fc4ea1039b0d22057.zip
build-477e963276a1fb3759cbf40fc4ea1039b0d22057.tar.gz
build-477e963276a1fb3759cbf40fc4ea1039b0d22057.tar.bz2
am ea4d9f55: am 22b5d621: DO NOT MERGE. We are now dev branch for Honeycomb MR2.
* commit 'ea4d9f557b20e7a4ef77e6ac0c573cf3a9a5fd3a': DO NOT MERGE. We are now dev branch for Honeycomb MR2.
Diffstat (limited to 'core')
-rw-r--r--core/version_defaults.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/version_defaults.mk b/core/version_defaults.mk
index 04d5330..76ab0fc 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 := 3.1
+ PLATFORM_VERSION := HoneycombMR2
endif
ifeq "" "$(PLATFORM_SDK_VERSION)"
@@ -59,7 +59,7 @@ endif
ifeq "" "$(PLATFORM_VERSION_CODENAME)"
# This is the current development code-name, if the build is not a final
# release build. If this is a final release build, it is simply "REL".
- PLATFORM_VERSION_CODENAME := REL
+ PLATFORM_VERSION_CODENAME := HoneycombMR2
endif
ifeq "" "$(DEFAULT_APP_TARGET_SDK)"