commit 784a663550c7c8e6a5785059a0236b2d9f8ed12e
author Ian Pedowitz <ijpedowitz@google.com> Fri Jun 24 02:51:25 2016 +0000
committer android-build-merger <android-build-merger@google.com> Fri Jun 24 02:51:25 2016 +0000
tree 5de1514a7ac831d7ed043630a024466302b6fe39
parent a51b0b60121031ceadb87b4899113437911ad6c5
parent 7b352c1d704fe73e2e5c11af102f8dd9a07a1464

Merge \"Revert \"Revert \"Removing N from PLATFORM_VERSION_ALL_CODENAMES\"\"\" into nyc-mr1-dev
am: 7b352c1d70

Change-Id: Ib23fca169a84e412643a8fcc79ed33126485192f

core/version_defaults.mk

diff --git a/core/version_defaults.mk b/core/version_defaults.mk
index f6e2bee..141c27b 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)"