tree 834d1ddf83149ac25b54ac0e7db500602750c7c0
parent 0dd8e71b4b1fe94ca9e1903f49b93cc996032e60
parent fd7d77cbfd4843b575d195c5716bb7b75b59f826
author Michael Bestas <mkbestas@lineageos.org> 1718416064 +0300
committer Michael Bestas <mkbestas@lineageos.org> 1718416064 +0300
mergetag object fd7d77cbfd4843b575d195c5716bb7b75b59f826
 type commit
 tag android-14.0.0_r50
 tagger The Android Open Source Project <initial-contribution@android.com> 1718055846 -0700
 
 Android 14.0.0 Release 50 (AP2A.240605.024)
 -----BEGIN PGP SIGNATURE-----
 
 iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCZmdzpgAKCRDorT+BmrEO
 eCa4AJ9SmR95oYqsQOdeej1x5Xy9oUmhIwCfRT779cg1ojwL8Vb1FMabjUVD1xg=
 =QeIl
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQJLBAABCgA1FiEEHrBYPudH862glXQBzJUERRm+ZmkFAmZs8sEXHG1rYmVzdGFz
 QGxpbmVhZ2Vvcy5vcmcACgkQzJUERRm+ZmlbCBAAwKC8G1LT3bc2OCMyt0QeAUAK
 8jChVTYnQz0XU/mNNZ07KE2zGnRVyDThqn37O9it4VjIsQKNKJ9OIq7hyADe0O2R
 LozAu1zjh6VkGa9tBbPWTqC7CNRkXOjPOkfJcCZELnEXHFKhMqAAVL0OgaRN4VGW
 hegUfICDDH6B4aY8NtMGQI3MDfQJPDsVjJfwtpvUI537h2VdigVjC6q9dv6XYKju
 qnRTf12qp13JEAwyLt6OFMFIw47Rt4cPd3Ks2pGw3Dk0YtALwRASEIK0Es1dsj0m
 RJBPSnKZU9KAoRho/nenaoiBbGHZMkJ4I3814JCsKKiZvS9aqQ32yhxExQyZ2CDy
 wJU1SyBjsJuDDDG4UGCZ9flHr5Q/0sM8n0lSBUXOxKwXL4LHB5MDoGcM+JB3q+Mf
 ZgN3Zo9enRMHS1mGg8UWBqWlkisMznovnBXqmjD5nodqtO73UNJlAermvr4gL0mv
 C2BlMLYeU7GxSSMl+6xxVLHMmvFSKRsIJ/8IomflXV00nuLtqRHbLuWCLl9vjthO
 hP1F5bKeq7unUURIvM9fYTnAIM7n5c3D2gHlTn9bZk1H4OcGmhKrlqG1GGR3dsUv
 rQS8fQJMaacyfBa76aftt8Jh9i9MfVlxxHYxJ6ugIwxF+vcqJqarqDIp9T8+z51u
 Ib+iCv0PLDEdD1reV7M=
 =tOUz
 -----END PGP SIGNATURE-----

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+BmrEOeAUCZmdzpgAKCRDorT+BmrEO
# eCa4AJ9SmR95oYqsQOdeej1x5Xy9oUmhIwCfRT779cg1ojwL8Vb1FMabjUVD1xg=
# =QeIl
# -----END PGP SIGNATURE-----
# gpg: Signature made Tue Jun 11 00:44:06 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 2499 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 Bill Yi (27) and others
# Via Automerger Merge Worker (24) and others
* tag 'android-14.0.0_r50': (31 commits)
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE
  Move Im and SipAddress to legacy field
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE
  Baseline NewApi issues
  ...

 Conflicts:
	res/values/ids.xml

Change-Id: If5eda69021478c41ab67fca7505f7090e3fca6a9