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

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

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

Android 14.0.0 Release 17 (UQ1A.231205.015)

# -----BEGIN PGP SIGNATURE-----
#
# iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCZXDPNgAKCRDorT+BmrEO
# eCcjAJ9T6us1z5JRprqUzA4T5OlPpKQ3VACfUW3q78FXOBoLUxYmur0vwUG+Rsc=
# =h4m/
# -----END PGP SIGNATURE-----
# gpg: Signature made Wed Dec  6 21:44:54 2023 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 2179 signatures in the past
#      2 years.  Encrypted 4 messages in the past 23 months.
# 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 (92) and others
# Via Automerger Merge Worker (367) and others
* tag 'android-14.0.0_r17': (128 commits)
  Version bump to UQ1A.231205.015 [core/build_id.mk]
  Version bump to UQ1A.231205.014.X1 [core/build_id.mk]
  Version bump to UQ1A.231205.014.A1 [core/build_id.mk]
  Version bump to UQ1A.231205.014 [core/build_id.mk]
  Version bump to UQ1A.231205.013.A1 [core/build_id.mk]
  Version bump to UQ1A.231205.013 [core/build_id.mk]
  Version bump to UQ1A.231205.012.A1 [core/build_id.mk]
  Version bump to UQ1A.231205.012 [core/build_id.mk]
  Version bump to UQ1A.231205.011.T1 [core/build_id.mk]
  Version bump to UQ1A.231205.011 [core/build_id.mk]
  Version bump to UQ1A.231205.009.T1 [core/build_id.mk]
  Version bump to UQ1A.231205.010 [core/build_id.mk]
  Version bump to UQ1A.231205.009.X1 [core/build_id.mk]
  Version bump to UQ1A.231205.009 [core/build_id.mk]
  Version bump to UQ1A.231205.008 [core/build_id.mk]
  Version bump to UQ1A.231205.007 [core/build_id.mk]
  Version bump to UQ1A.231205.006 [core/build_id.mk]
  Version bump to UQ1A.231205.004.T1 [core/build_id.mk]
  Version bump to UQ1A.231013.002.X1 [core/build_id.mk]
  Version bump to UQ1A.231205.005 [core/build_id.mk]
  ...

 Conflicts:
	core/build_id.mk
	core/version_defaults.mk

Change-Id: Id381cf6973ea3df3de2fbc122fa0a1148d0f580d
parents a542ab45 e07e49ac
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