commit e4e7746e21642d3688330796f6cb5ddb6f02274c
author The Android Automerger <android-build@google.com> Thu Aug 27 01:01:20 2015 -0700
committer The Android Automerger <android-build@google.com> Thu Aug 27 01:01:20 2015 -0700
tree dfd3205bb7dac4f13e2f7d2c00121ed6d4aeb2ad
parent 4fc1467949aaf9e6a49a6771ed996e3c2c702314
parent c6eda23ee7a09068d34611e1940c69d325b8dacb

merge in mnc-release history after reset to mnc-dev

core/build_id.mk

diff --git a/core/build_id.mk b/core/build_id.mk
index 8dc2ebd..0e8e2cf 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=MRA57B
+export BUILD_ID=MASTER

core/main.mk

diff --git a/core/main.mk b/core/main.mk
index 4f22b93..5b6e1e9 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -939,6 +939,7 @@
   $(call dist-for-goals, droidcore, \
     $(INTERNAL_UPDATE_PACKAGE_TARGET) \
     $(INTERNAL_OTA_PACKAGE_TARGET) \
+    $(BUILT_OTATOOLS_PACKAGE) \
     $(SYMBOLS_ZIP) \
     $(INSTALLED_FILES_FILE) \
     $(INSTALLED_BUILD_PROP_TARGET) \