[automerger skipped] Merge "Specify default image block size of 512KB by default" into qt-dev am: 6e0bc97875 am: 0fef2ff79d -s ours
am: f4560f1a78 -s ours
am skip reason: change_id I172935c8dd9c729199d9015e82487f84018bb9f4 with SHA1 6cbc3899b3 is in history
Change-Id: I1275909b0539f6236d91c07c75eec69963933c73
diff --git a/core/build_id.mk b/core/build_id.mk
index 2329288..2f9c3f3 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.
-BUILD_ID=QT
+BUILD_ID=MASTER
diff --git a/target/product/mainline_system.mk b/target/product/mainline_system.mk
index 0949616..54a9625 100644
--- a/target/product/mainline_system.mk
+++ b/target/product/mainline_system.mk
@@ -19,7 +19,7 @@
$(call inherit-product, $(SRC_TARGET_DIR)/product/telephony_system.mk)
$(call inherit-product, $(SRC_TARGET_DIR)/product/languages_default.mk)
# Enable updating of APEXes
-#$(call inherit-product, $(SRC_TARGET_DIR)/product/updatable_apex.mk)
+$(call inherit-product, $(SRC_TARGET_DIR)/product/updatable_apex.mk)
# Add adb keys to debuggable AOSP builds (if they exist)
$(call inherit-product-if-exists, vendor/google/security/adb/vendor_key.mk)