am 7e1ce27c: Merge commit \'50738779\' into gingerbread-plus-aosp

* commit '7e1ce27c08ec57032520613488ec2fe5b3795126':
  DO NOT MERGE Fix issue #3373438: Update GBMR versions
This commit is contained in:
Ed Heyl 2011-01-21 17:41:23 -08:00 committed by Android Git Automerger
commit 1d4e3fdeb4

View file

@ -41,7 +41,7 @@ ifeq "" "$(PLATFORM_VERSION)"
# which is the version that we reveal to the end user. # which is the version that we reveal to the end user.
# Update this value when the platform version changes (rather # Update this value when the platform version changes (rather
# than overriding it somewhere else). Can be an arbitrary string. # than overriding it somewhere else). Can be an arbitrary string.
PLATFORM_VERSION := AOSP PLATFORM_VERSION := 2.3.3
endif endif
ifeq "" "$(PLATFORM_SDK_VERSION)" ifeq "" "$(PLATFORM_SDK_VERSION)"
@ -96,4 +96,3 @@ ifeq "" "$(BUILD_NUMBER)"
# anyone trying to parse it as an integer will probably get "0". # anyone trying to parse it as an integer will probably get "0".
BUILD_NUMBER := eng.$(USER).$(shell date +%Y%m%d.%H%M%S) BUILD_NUMBER := eng.$(USER).$(shell date +%Y%m%d.%H%M%S)
endif endif