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

Skip to content
Unverified Commit 73d16302 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
# eBrKAJ9FmL5mDOHG8U+CMKbPhMhF6MfpaQCdERo5ad5GLy9WXkX8q7C7Xy03FVs=
# =dG9F
# -----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 Android Build Coastguard Worker (138) and others
# Via Automerger Merge Worker (847) and others
* tag 'android-15.0.0_r6': (472 commits)
  Version bump to AP4A.241205.013 [core/build_id.mk]
  Version bump to AP4A.241205.012 [core/build_id.mk]
  Version bump to AP4A.241205.011 [core/build_id.mk]
  Version bump to AP4A.241205.010 [core/build_id.mk]
  Version bump to AP4A.241205.009 [core/build_id.mk]
  Version bump to AP4A.241205.004.X1 [core/build_id.mk]
  Revert^3 "Use -target-feature for MTE"
  Version bump to AP4A.241205.007 [core/build_id.mk]
  Version bump to AP4A.241205.006 [core/build_id.mk]
  Version bump to AP4A.241205.005.X1 [core/build_id.mk]
  Version bump to AP4A.241205.005 [core/build_id.mk]
  Version bump to AP4A.241205.004.E1 [core/build_id.mk]
  Version bump to AP4A.241205.004.W1 [core/build_id.mk]
  Version bump to AP4A.241205.004 [core/build_id.mk]
  Version bump to AP4A.241205.003 [core/build_id.mk]
  Version bump to AP4A.241205.002 [core/build_id.mk]
  Version bump to AP4A.241205.001 [core/build_id.mk]
  Version bump to AP4A.240925.023 [core/build_id.mk]
  Version bump to AP4A.240925.022 [core/build_id.mk]
  Version bump to AP4A.240925.021 [core/build_id.mk]
  ...

 Conflicts:
	core/Makefile
	core/android_soong_config_vars.mk
	core/build_id.mk
	core/config.mk
	core/soong_config.mk
	core/soong_extra_config.mk
	core/sysprop.mk
	target/product/base_product.mk
	target/product/base_vendor.mk

Change-Id: I53f95787079151ab3286df9e72ac53a17a86a863
parents a618737e 64078752
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