commit d325ccef0f4b4f8fb13f1a4d88a3fe14e0a7a632
author Ian Pedowitz <ijpedowitz@google.com> Wed Jul 06 12:02:14 2016 -0700
committer Ian Pedowitz <ijpedowitz@google.com> Wed Jul 06 12:02:14 2016 -0700
tree 685c3345d7bb34a6d5eef7c3885afd1de8ba51b8
parent 25d83667e70a2a74f21bbfe1bcea0551c3ba76b6
parent 29fe197c2531916ce5d8b5adf4eedc4869f30e03

resolve merge conflicts of 29fe197 to master

Change-Id: I44e73b53e3cd05faf70412f31bc95d60a1200916

core/version_defaults.mk

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