resolved conflicts for merge of c1b33081 to gingerbread-plus-aosp - DO NOT MERGE

Change-Id: I785e36efe89cc11e2dacfb4a30901be93453f221
This commit is contained in:
Jean-Baptiste Queru 2010-12-14 16:11:06 -08:00
commit 3463d0e102

View file

@ -53,7 +53,7 @@ ifeq "" "$(PLATFORM_SDK_VERSION)"
# intermediate builds). During development, this number remains at the
# SDK version the branch is based on and PLATFORM_VERSION_CODENAME holds
# the code-name of the new development work.
PLATFORM_SDK_VERSION := 8
PLATFORM_SDK_VERSION := 10
endif
ifeq "" "$(PLATFORM_VERSION_CODENAME)"