Merge \"Removing N from PLATFORM_VERSION_ALL_CODENAMES\" into nyc-dev

am: ddc0c5e0a0

Change-Id: I1f68aa77d52fb85a3d87a3155b9eefb1ff647c31
This commit is contained in:
Ian Pedowitz
2016-06-08 03:09:44 +00:00
committed by android-build-merger

View File

@@ -75,7 +75,7 @@ ifeq "" "$(PLATFORM_VERSION_CODENAME)"
# This is all of the development codenames that are active. Should be either
# the same as PLATFORM_VERSION_CODENAME or a comma-separated list of additional
# codenames after PLATFORM_VERSION_CODENAME.
PLATFORM_VERSION_ALL_CODENAMES := $(PLATFORM_VERSION_CODENAME),N
PLATFORM_VERSION_ALL_CODENAMES := $(PLATFORM_VERSION_CODENAME)
endif
ifeq "REL" "$(PLATFORM_VERSION_CODENAME)"