commit 0c822614f5db9b1e1426e5888e5b2b537e015fbb
author Ian Pedowitz <ijpedowitz@google.com> Wed Jun 08 03:09:44 2016 +0000
committer android-build-merger <android-build-merger@google.com> Wed Jun 08 03:09:44 2016 +0000
tree 4a1c1c421d90eff370a82eb33a38bc660dcac4f5
parent 61e811370dec47396ff4c0732f19b30cf1f88605
parent ddc0c5e0a0b65b4ce9bb5a295a49caf565b87857

Merge \"Removing N from PLATFORM_VERSION_ALL_CODENAMES\" into nyc-dev
am: ddc0c5e0a0

Change-Id: I9c08a086b508b78ddecc53e0aae08d25460f0595

core/version_defaults.mk

diff --git a/core/version_defaults.mk b/core/version_defaults.mk
index bdfc65a..5acd4dd 100644
--- a/core/version_defaults.mk
+++ b/core/version_defaults.mk
@@ -75,7 +75,7 @@
   # 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)"