From ef88d9cd99589248d18aeed583f4d4bb1bdd4a8f Mon Sep 17 00:00:00 2001 From: Xin Li Date: Mon, 9 Dec 2019 13:28:32 -0800 Subject: [PATCH] Make qt-qpr1-dev-plus-aosp use AOSP.MASTER as BUILD_ID. In ag/7020561, after branching of qt-dev, the BUILD_ID was changed to "QT" and the change was tagged as "DO NOT MERGE" to prevent it flowing into master. However, because the -plus-aosp branches was using the same API level and "DO NOT MERGE" will not be respected there, it would eventually be merged to stage-aosp-master and promoted to AOSP master. Address this by using AOSP.MASTER which will cause a merge conflict when the merge happens. Bug: 145935472 Change-Id: Iaa17a2c29f1f3cf28f28761a18b0d480b0253fac Merged-In: I5c28225d61996cb719ae384d7b0828776e84f8d5 --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 7f8c2f365..ba5ca42dc 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.191003.001 +BUILD_ID=AOSP.MASTER