Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit 3f168464 authored by Michael Bestas's avatar Michael Bestas
Browse files

Merge tag 'android-12.1.0_r11' into staging/lineage-19.1_merge-android-12.1.0_r11 

Android 12.1.0 release 11

# -----BEGIN PGP SIGNATURE-----
#
# iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCYsXElgAKCRDorT+BmrEO
# eGiBAJ4gnQuGd2JDr+JS0F1c9WT2qySDrwCbBkrORN5J9BzZTEVqwO3WHohuT80=
# =sYwO
# -----END PGP SIGNATURE-----
# gpg: Signature made Wed Jul  6 20:21:26 2022 EEST
# gpg:                using DSA key 4340D13570EF945E83810964E8AD3F819AB10E78
# gpg: Good signature from "The Android Open Source Project <initial-contribution@android.com>" [marginal]
# gpg: initial-contribution@android.com: Verified 1242 signatures in the past
#      8 months.  Encrypted 4 messages in the past 5 months.
# gpg: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg:          It is not certain that the signature belongs to the owner.
# Primary key fingerprint: 4340 D135 70EF 945E 8381  0964 E8AD 3F81 9AB1 0E78

# By Android Build Coastguard Worker (3) and Steve Berbary (1)
# Via Android Build Coastguard Worker
* tag 'android-12.1.0_r11':
  Version bump to SQ3A.220705.003.A1 [core/build_id.mk]
  Version bump to SQ3A.220705.003 [core/build_id.mk]
  Version bump to SQ3A.220705.002 [core/build_id.mk]
  Update Security String to 2022-07-05

 Conflicts:
	core/build_id.mk

Change-Id: I0717c0ea61f46d06a4168ceacaea8cdf8235fce6
parents 26aa5715 d065d5eb

core/build_id.mk

+1 −1
Original line number Diff line number Diff line
@@ -18,4 +18,4 @@ 
# (like "CRB01").  It must be a single word, and is

# capitalized by convention.



BUILD_ID=SQ3A.220605.009.A1
 
BUILD_ID=SQ3A.220705.003.A1

core/version_defaults.mk

+1 −1
Original line number Diff line number Diff line
@@ -240,7 +240,7 @@ ifndef PLATFORM_SECURITY_PATCH 
    #  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 := 2022-06-05

    PLATFORM_SECURITY_PATCH := 2022-07-05

endif

.KATI_READONLY := PLATFORM_SECURITY_PATCH