| commit | 18485d30c4e85ccc62eaa252e8b8ba66b3533b8d | [log] [tgz] |
|---|---|---|
| author | Jooyung Han <jooyung@google.com> | Thu Jul 13 02:02:52 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Jul 13 02:02:52 2023 +0000 |
| tree | d923187d61cf921f9bfed73e0b0a42569bd46863 | |
| parent | dffb22be1e458ecced7a3b988feb1fd748a6aa00 [diff] | |
| parent | b51bc1c77efbbd33f22d301c18959e39a0a505a8 [diff] |
Merge changes I16be0dcb,I4656d43d,I52b831df into main am: b51bc1c77e Original change: https://android-review.googlesource.com/c/platform/build/+/2646667 Change-Id: I92d6a88a456315fb2f715b6e69c75976450245dd Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/core/build_id.mk b/core/build_id.mk index ba5ca42..a489788 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=AOSP.MASTER +BUILD_ID=TM
diff --git a/core/version_defaults.mk b/core/version_defaults.mk index e288779..c107254 100644 --- a/core/version_defaults.mk +++ b/core/version_defaults.mk
@@ -103,7 +103,7 @@ # It must be of the form "YYYY-MM-DD" on production devices. # It must match one of the Android Security Patch Level strings of the Public Security Bulletins. # If there is no $PLATFORM_SECURITY_PATCH set, keep it empty. - PLATFORM_SECURITY_PATCH := 2023-07-05 + PLATFORM_SECURITY_PATCH := 2023-06-05 endif include $(BUILD_SYSTEM)/version_util.mk