Merge "4.1.1" into jb-dev

This commit is contained in:
Ed Heyl
2012-07-03 13:57:52 -07:00
committed by Android (Google) Code Review

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 := 4.1
PLATFORM_VERSION := 4.1.1
endif
ifeq "" "$(PLATFORM_SDK_VERSION)"
@@ -96,4 +96,3 @@ ifeq "" "$(BUILD_NUMBER)"
# anyone trying to parse it as an integer will probably get "0".
BUILD_NUMBER := eng.$(USER).$(shell date +%Y%m%d.%H%M%S)
endif