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

Unverified Commit 1fd393fe authored by Michael Bestas's avatar Michael Bestas
Browse files

Merge tag 'android-12.0.0_r26' into staging/lineage-19.0_merge-android-12.0.0_r26 

Android 12.0.0 release 26

# -----BEGIN PGP SIGNATURE-----
#
# iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCYdSrOQAKCRDorT+BmrEO
# eNHwAJ0d8IIgzqUFQ6JpUkFOEXcDdtEAywCfR494Krz4Y1ZIc12Qu+US0pSSwS4=
# =SWTc
# -----END PGP SIGNATURE-----
# gpg: Signature made Tue Jan  4 22:16:57 2022 EET
# 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 1020 signatures in the past
#      2 months.  Encrypted 4 messages in the past 3 days.
# 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 (16) and Paul Scovanner (2)
# Via Android Build Coastguard Worker
* tag 'android-12.0.0_r26':
  Version bump to SQ1A.220105.002 [core/build_id.mk]
  [DO NOT MERGE] Update Security String to 2022-01-05
  Version bump to SQ1A.211205.010 [core/build_id.mk]
  Version bump to SQ1A.211205.009 [core/build_id.mk]
  Version bump to SQ1A.211205.008 [core/build_id.mk]
  Version bump to SQ1A.211205.007 [core/build_id.mk]
  Version bump to SQ1A.211205.006 [core/build_id.mk]
  Version bump to SQ1A.211205.005 [core/build_id.mk]
  Version bump to SQ1A.211205.004 [core/build_id.mk]
  Version bump to SQ1A.211205.003 [core/build_id.mk]
  Version bump to SQ1A.211205.002 [core/build_id.mk]
  [DO NOT MERGE] Update SPL to 2021-12-05
  Version bump to SQ1A.211001.002 [core/build_id.mk]
  Version bump to SQ1A.210924.002 [core/build_id.mk]
  Version bump to SQ1A.210910.002 [core/build_id.mk]
  Version bump to SQ1A.210806.004 [core/build_id.mk]
  Version bump to SQ1A.210806.003 [core/build_id.mk]
  Version bump to SQ1A.210806.002 [core/build_id.mk]

 Conflicts:
	core/build_id.mk
	core/version_defaults.mk

Change-Id: I04ff8151537bb94ef5311d1a79d262c150936ea4
parents 1d316ef5 9e5ff987

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=SQ1D.211205.016.A1
 
BUILD_ID=SQ1A.220105.002

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 := 2021-12-05

      PLATFORM_SECURITY_PATCH := 2022-01-05

endif

.KATI_READONLY := PLATFORM_SECURITY_PATCH