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

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

Merge tag 'android-14.0.0_r50' into staging/lineage-21.0_merge-android-14.0.0_r50

Android 14.0.0 Release 50 (AP2A.240605.024)

# -----BEGIN PGP SIGNATURE-----
#
# iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCZmdzmgAKCRDorT+BmrEO
# eHAsAJ9/bYcq5CnzjdYd9IpU0OQ35r05IQCgiwUCm3RX8vAX64ZvmsDDXfRqmcg=
# =9wov
# -----END PGP SIGNATURE-----
# gpg: Signature made Tue Jun 11 00:43:54 2024 EEST
# 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 2465 signatures in the past
#      2 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 (124) and others
# Via Automerger Merge Worker (596) and others
* tag 'android-14.0.0_r50': (415 commits)
  Version bump to AP2A.240605.024 [core/build_id.mk]
  Version bump to AP2A.240605.023 [core/build_id.mk]
  Version bump to AP2A.240605.022 [core/build_id.mk]
  Version bump to AP2A.240605.021 [core/build_id.mk]
  Version bump to AP2A.240605.020 [core/build_id.mk]
  Version bump to AP2A.240605.019 [core/build_id.mk]
  Enable build flags in protobuf
  Do not use build/trunk_release/release_config_map.mk
  Defer "no such release config" error
  Allow duplicate release config maps and build flag declarations
  Look for release_config_map.mk in more projects
  Version bump to AP2A.240605.018 [core/build_id.mk]
  Version bump to AP2A.240605.017 [core/build_id.mk]
  Version bump to AP2A.240605.016 [core/build_id.mk]
  Version bump to AP2A.240605.015 [core/build_id.mk]
  Version bump to AP2A.240605.014 [core/build_id.mk]
  Version bump to AP2A.240605.013 [core/build_id.mk]
  Version bump to AP2A.240605.012 [core/build_id.mk]
  Version bump to AP2A.240605.011 [core/build_id.mk]
  Version bump to AP2A.240605.010 [core/build_id.mk]
  ...

 Conflicts:
	core/build_id.mk
	tools/post_process_props.py
	tools/releasetools/ota_from_target_files.py
	tools/releasetools/sign_target_files_apks.py

Change-Id: Id454c89ca61f615d50cb390d0f8e1a5fa0c28e47
parents 4888c1c6 d15aa6b4
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