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

Skip to content
Commit 7aa50e22 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+BmrEOeAUCZ1IssgAKCRDorT+BmrEO
# eN//AJ9NEx4dvEhMB1f+tvqosS/AfQUsdgCeJmjkG+UjuATnOw+2eswrwDlOQ1M=
# =763b
# -----END PGP SIGNATURE-----
# gpg: Signature made Fri Dec  6 00:44:02 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 2469 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 Colin Cross (2) and others
# Via Automerger Merge Worker (13) and others
* tag 'android-15.0.0_r6':
  Make java_sdk_library dependencies explicit
  Set use_resource_processor: false for Dialer
  Set use_resource_processor: false for Dialer
  Convert Dialer to Android.bp
  Clear cached on TRIM_MEMORY_BACKGROUND

 Conflicts:
	Android.bp
	AndroidManifest.xml

Change-Id: I7a6867877b3f48a712edb9ec918e6aa270917b9b
parents 6e2bc49f f9ddb4b7
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment