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

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

Merge tag 'android-15.0.0_r20' into staging/lineage-22.2_merge-android-15.0.0_r20

Android 15.0.0 Release 20 (BP1A.250305.019)

# -----BEGIN PGP SIGNATURE-----
#
# iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCZ8eo9AAKCRDorT+BmrEO
# eKrLAJ9SWhwTAcehbeKHZQG4/iMUNVmKFgCfR3sycUAdoBivFbidPj8GVrpwRQw=
# =rEtL
# -----END PGP SIGNATURE-----
# gpg: Signature made Wed Mar  5 03:29:24 2025 EET
# gpg:                using DSA key 4340D13570EF945E83810964E8AD3F819AB10E78
# gpg: Good signature from "The Android Open Source Project <initial-contribution@android.com>" [ultimate]

# By Nelson Li (4) and others
# Via Automerger Merge Worker (19) and others
* tag 'android-15.0.0_r20':
  Specify recovery property in recovery_deps
  Convert librecovery_ui_ext to Android.bp
  Convert librecovery_ui_ext to Android.bp
  Define recovery resources prebuilt_res modules
  Convert recovery_deps to Android.bp
  recovery: use v4 Health HAL
  Keep RECOVERY_API_VERSION and RECOVERY_FSTAB_VERSION in sync.
  Make bootloader_message ramdisk_available.
  Display recovery reason in prompt_and_wipe_data
  rm -rf non-AB code

 Conflicts:
	Android.mk

Change-Id: I0041e1fc624245efe97dd2c9eb77bf672736bcaa
parents 78cde945 e7c364b6
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