Merge tag 'android-12.1.0_r7' into staging/lineage-19.1_merge-android-12.1.0_r7
Android 12.1.0 Release 7 (SQ3A.220605.009.A1) # -----BEGIN PGP SIGNATURE----- # # iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCYp57OgAKCRDorT+BmrEO # eOxTAJ4kycCkByop2Dwc61k71pKbQWO0xwCdEEOau3b51qC6fLYPNbAhFEsBNDM= # =CWiR # -----END PGP SIGNATURE----- # gpg: Signature made Tue Jun 7 01:10:02 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 1180 signatures in the past # 7 months. Encrypted 4 messages in the past 4 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 Bill Yi (12) and John Shao (3) # Via Automerger Merge Worker (16) and others * tag 'android-12.1.0_r7': Import translations. DO NOT MERGE ANYWHERE Import translations. DO NOT MERGE ANYWHERE Import translations. DO NOT MERGE ANYWHERE Import translations. DO NOT MERGE ANYWHERE Import translations. DO NOT MERGE ANYWHERE Import translations. DO NOT MERGE ANYWHERE No longer export CallSubjectDialog No longer export CallSubjectDialog Update min and target SDK of Contacts to 31 Import translations. DO NOT MERGE ANYWHERE Import translations. DO NOT MERGE ANYWHERE Import translations. DO NOT MERGE ANYWHERE Import translations. DO NOT MERGE ANYWHERE Import translations. DO NOT MERGE ANYWHERE Import translations. DO NOT MERGE ANYWHERE Conflicts: AndroidManifest.xml Change-Id: I460005b1a01fbae97caaa43878dd921129e239d2
Loading
Please register or sign in to comment