merge in nyc-mr1-release history after reset to nyc-mr1-dev
diff --git a/core/build_id.mk b/core/build_id.mk
index 0c9000d..5a012b9 100644
--- a/core/build_id.mk
+++ b/core/build_id.mk
@@ -18,4 +18,4 @@
# (like "CRB01"). It must be a single word, and is
# capitalized by convention.
-export BUILD_ID=NME06
+export BUILD_ID=NYC
diff --git a/core/version_defaults.mk b/core/version_defaults.mk
index c026675..5a46a25 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)"
