[conflict] Merge "Update BUILD_ID" into aosp-main-future am: 33e1da8114 am: fbd3468d1e

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/24045736

Change-Id: I07e0288cd11ad3500746f0ffdf620a5e4b93c0b4
Merged-In: I740ef3225c4c291ef7313d3ff1fe5d78389497f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-07-13 20:10:43 +00:00
committed by Amith Dsouza

View File

@@ -18,4 +18,4 @@
# (like "CRB01"). It must be a single word, and is
# capitalized by convention.
BUILD_ID=MASTER
BUILD_ID=MAIN