commit 49fcf54a704c43e4e25c7bc441a3b9ed0d28e67c
author gitbuildkicker <android-build@google.com> Wed Oct 05 00:05:46 2016 -0700
committer gitbuildkicker <android-build@google.com> Wed Oct 05 00:05:46 2016 -0700
tree 80759f9429f7c97ed47aa5c223e9293a278c9f9b
parent bee409ba50ed738f5ea94c2626a74d8bbb05a151
parent d98962f49a354d7cc6744d8226ddf10c8b288eba

merge in nyc-mr1-release history after reset to nyc-mr1-dev

core/Makefile

diff --git a/core/Makefile b/core/Makefile
index 2031132..7676a4f 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -1383,6 +1383,8 @@
 $(INSTALLED_USERDATATARBALL_TARGET): $(FS_GET_STATS) $(INTERNAL_USERDATAIMAGE_FILES)
 	$(build-userdatatarball-target)
 
+$(call dist-for-goals,userdatatarball,$(INSTALLED_USERDATATARBALL_TARGET))
+
 .PHONY: userdatatarball-nodeps
 userdatatarball-nodeps: $(FS_GET_STATS)
 	$(build-userdatatarball-target)

core/build_id.mk

diff --git a/core/build_id.mk b/core/build_id.mk
index 7cc4ffd..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=NMF04B
+export BUILD_ID=NYC