Merge "[automerger skipped] Merge "Appending per-partition os_version into AVB props" into qt-dev am: 61c5d29655 am: c344b21ef4 -s ours
am: 9187e1232e -s ours
am skip reason: change_id I21a77420f2e8a3456f7a8cae5158eb8fc41319e7 with SHA1 9b54801b58 is in history
Change-Id: Id3212e45cd08aed079ad8f0096441a2b307bff0c
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)