Merge "Make AOSP master use AOSP.MASTER as BUILD_ID."
am: ed7d5f12e3

Change-Id: I19cffa65f42c92e1b39622e736257230c711182d
diff --git a/core/build_id.mk b/core/build_id.mk
index cefc4b2..ba5ca42 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=QQ1A.191205.011
+BUILD_ID=AOSP.MASTER