commit 364e42edaedd76e0e5cbcd4721178d471f9f1570
author Ian Pedowitz <ijpedowitz@google.com> Fri Jun 03 19:50:41 2016 +0000
committer android-build-merger <android-build-merger@google.com> Fri Jun 03 19:50:41 2016 +0000
tree 8e8c1ef12b1de2b98ce42e9416e0cc5337f1137d
parent 672cda26d782d2313849644496f0c6a37b1ae107
parent 637c0192fcede4e91b4040bf9c486dfe1fb93d74

resolve merge conflicts of f2304ce to nyc-mr1-dev
am: 637c0192fc

* commit '637c0192fcede4e91b4040bf9c486dfe1fb93d74':
  NYC is now REL

Change-Id: Id0a79354dedbe45304e7d93f650878c2ba184262

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)"