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

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

Merge tag 'android-15.0.0_r6' into staging/lineage-22.0_merge-android-15.0.0_r6

Android 15.0.0 Release 6 (AP4A.241205.013)

# -----BEGIN PGP SIGNATURE-----
#
# iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCZ1IssQAKCRDorT+BmrEO
# eE/LAJ46CUEJQsIKxKS1YELAXcQftqyzQwCfRvoOgoaBStyfx7pDByqUc8dESEA=
# =jrBE
# -----END PGP SIGNATURE-----
# gpg: Signature made Fri Dec  6 00:44:01 2024 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 2457 signatures in the past
#      3 years.  Encrypted 4 messages in the past 2 years.
# 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 (3) and others
# Via Automerger Merge Worker (21) and others
* tag 'android-15.0.0_r6':
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE
  Remove unused variable.
  Import translations. DO NOT MERGE ANYWHERE
  Add libboot_control_client dependency to librecovery_ui
  Skip F2FS formatting in non-4K mode
  The libc++ upgrade means we can use contains in minadb now.
  libc++fs is part of libc++ now.
  Remove unnecessary minui dependency on libz

 Conflicts:
	recovery_utils/roots.cpp

Change-Id: I1c403cd3bb6e05f4c0523140f207c316ae46da01
parents cccb3452 c87e1e69
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