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.
This commit is contained in:
Dianne Hackborn
2011-05-11 13:35:36 -07:00
committed by Android Git Automerger
2 changed files with 5 additions and 2 deletions

View File

@@ -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)"