commit 4a0723af3c8ba4a90ee35aca7bdc0a2c46c52dc3
author Ian Pedowitz <ijpedowitz@google.com> Fri Jun 03 13:00:18 2016 -0700
committer Ian Pedowitz <ijpedowitz@google.com> Fri Jun 03 13:00:18 2016 -0700
tree 4325e5c465a7461799a0425c8c40a5d65c139bd1
parent 68bcb1ff4c4ecb348de1d5e63514828d2e35ae17
parent 364e42edaedd76e0e5cbcd4721178d471f9f1570

resolve merge conflicts of 364e42e to master

Change-Id: I0d742baa230d2d55b34de4f4a7a441dfb214d133

core/version_defaults.mk

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