summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2011-05-11 13:35:36 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2011-05-11 13:35:36 -0700
commitea4d9f557b20e7a4ef77e6ac0c573cf3a9a5fd3a (patch)
tree69ad809a80484443ac6ba9d0a0c47a314fd65c60 /core
parent7c1a1247f3e7110a95696671e8f71334e9b3c1b5 (diff)
parent22b5d62172f1563a2513dea314c037703cddf217 (diff)
downloadbuild-ea4d9f557b20e7a4ef77e6ac0c573cf3a9a5fd3a.zip
build-ea4d9f557b20e7a4ef77e6ac0c573cf3a9a5fd3a.tar.gz
build-ea4d9f557b20e7a4ef77e6ac0c573cf3a9a5fd3a.tar.bz2
am 22b5d621: DO NOT MERGE. We are now dev branch for Honeycomb MR2.
* commit '22b5d62172f1563a2513dea314c037703cddf217': 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)"