commit 266600b6391a142c1127db2c2dd738cb1bc7a0df
author Ian Pedowitz <ijpedowitz@google.com> Fri Jun 24 17:52:29 2016 +0000
committer Ian Pedowitz <ijpedowitz@google.com> Fri Jun 24 17:52:29 2016 +0000
tree 438427ffc9ac220093b60642cefc84ff7c6c5c70
parent 369efe3d84f059ba41560d6522520c747f1274b2

Revert "Revert "Revert "Removing N from PLATFORM_VERSION_ALL_CODENAMES"""

This reverts commit 369efe3d84f059ba41560d6522520c747f1274b2.

Bug: 29117805
Bug: 28809789
Bug: 29621988
Change-Id: Icd9e01d4cbd3f769237702f5df287eb61c7527cd

core/version_defaults.mk

diff --git a/core/version_defaults.mk b/core/version_defaults.mk
index 5acd4dd..bdfc65a 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)
+  PLATFORM_VERSION_ALL_CODENAMES := $(PLATFORM_VERSION_CODENAME),N
 endif
 
 ifeq "REL" "$(PLATFORM_VERSION_CODENAME)"