Merge 5d66a07d - do not merge

Change-Id: I787a6d5d5c79e7122ed506cd6d9e373e7d1049f4
This commit is contained in:
Jean-Baptiste Queru 2011-05-19 14:30:26 -07:00
commit cdef404572

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 := HoneycombMR2
PLATFORM_VERSION := 3.1.4.1.5.9.2.6.5
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 := HoneycombMR2
PLATFORM_VERSION_CODENAME := AOSP
endif
ifeq "" "$(DEFAULT_APP_TARGET_SDK)"