tree 685146d828182496a6453f329c178907eaa47eef
parent cccb34529c3f4ecd5dfc2eb6b182ccade7d880c0
parent c87e1e691fff15c92e90603d7b5e509094be896c
author Michael Bestas <mkbestas@lineageos.org> 1733856593 +0200
committer Michael Bestas <mkbestas@lineageos.org> 1733856593 +0200
mergetag object c87e1e691fff15c92e90603d7b5e509094be896c
 type commit
 tag android-15.0.0_r6
 tagger The Android Open Source Project <initial-contribution@android.com> 1733438641 -0800
 
 Android 15.0.0 Release 6 (AP4A.241205.013)
 -----BEGIN PGP SIGNATURE-----
 
 iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCZ1IssQAKCRDorT+BmrEO
 eE/LAJ46CUEJQsIKxKS1YELAXcQftqyzQwCfRvoOgoaBStyfx7pDByqUc8dESEA=
 =jrBE
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQJLBAABCgA1FiEEHrBYPudH862glXQBzJUERRm+ZmkFAmdYjVIXHG1rYmVzdGFz
 QGxpbmVhZ2Vvcy5vcmcACgkQzJUERRm+Zmkksg//QPlOaNx9b7tX9MxKRh/FfCGh
 bQHYmZaveXdKsfFT3NOlEfRng+J4cDZP5TjpesAQeWZSrhZ853XEWdIb9v7DkXWw
 U7Lr9PoXQWw1NwUHoDf8KITQ3y6gCeuQb7afHcB+35V1WKNp/91EBjwdVUwUrrOC
 MirJlv0kT+myZGG0mY2YY2/iLLLaifnm7w0EbtQl+FlfsZkNMgr07EbXrTBGHhR/
 Twvyz6DJ+J3pgOk/h+zp9FqjVErFrTHCwTp2qeX21idlRLa+du4EwvYSfnECETQ0
 gL2cVgweikJYKQkXm7S8tpR0hlHg8Gt0ToZFLB+N2cm/+i34Xe9LVDlv6SYVDkG1
 AJdyKutR6Q8bMjjTEivC/oHf3BD5Ol7WJ+F/ctd3qO/4Wj+FeHk6iJHiWyQCctsb
 EZugG51I/OIwzGq3eYsJmS8bRuRV+kVC+e0Xbhck4YNpStdKSlxlhO51vOErHMYJ
 2Bgdh/2S7tlEwr7xSakEXySFKDMBkxs21J8WtVU58Pg1KsCdfqfzYYUA8qbCbP33
 fDvniYTWT6zLWOOwutX/jwVaDuQBoF5aFASKmIpebo4LsDZ2i1ca3ecQvLpvICyP
 HAsJsju+JIXQnaeRWsbaNsVX/uPzLuGNOUpuzibyfp+oj5MZDI9VeCZ2KY/AD9kG
 CyBVrIriZrSG51bqOS0=
 =ccLt
 -----END PGP SIGNATURE-----

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