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

Skip to content
Unverified Commit c04314fb authored by Michael Bestas's avatar Michael Bestas
Browse files

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

Android 12.0.0 Release 29 (SQ1D.220205.003)

# -----BEGIN PGP SIGNATURE-----
#
# iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCYfzJjgAKCRDorT+BmrEO
# eHLfAJ46QJRdfjQ7hik3uQ82Gcb47uC+ZACgjtzB/jCXlGC+Nf1BDjI5iYndVFQ=
# =V8aO
# -----END PGP SIGNATURE-----
# gpg: Signature made Fri Feb  4 08:37:02 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 1048 signatures in the past
#      3 months.  Encrypted 4 messages in the past 4 weeks.
# 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 Alex Johnston (1) and others
# Via Android Build Coastguard Worker
* tag 'android-12.0.0_r29':
  Add non system overlay flag to InstallCaCertificateWarning
  Import translations. DO NOT MERGE ANYWHERE
  Rephrase dialog message of clear storage dialog for security concern

Change-Id: Ib2a8c03b9dfc4a05862ca67050760920abc34f96
parents 79f68a4f 89847c90
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment