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

Skip to content
Unverified Commit 2452c62d 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+BmrEOeAUCZXDPMwAKCRDorT+BmrEO
# eDsNAJwPNh3ft5QqeATgPUtj/1HcdXDx+ACeOU6T39nl9EGDNaXx9W9669E/NN4=
# =Ml22
# -----END PGP SIGNATURE-----
# gpg: Signature made Wed Dec  6 21:44:51 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 2194 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 Bill Yi (180) and others
# Via Automerger Merge Worker (1804) and others
* tag 'android-14.0.0_r17': (482 commits)
  Revert fixing the style of Choose screen lock wasn’t consistent in initial setup and deferred setup
  Remove 4:3 aspect ratio option for foldables
  Add aspect ratio settings to advanced category children
  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
  Add controller to Advanced category in Apps page
  Import translations. DO NOT MERGE ANYWHERE
  Add warning text to Aspect ratio app info header
  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
  ...

 Conflicts:
	src/com/android/settings/notification/VolumeSeekBarPreference.java
	tests/robotests/src/com/android/settings/notification/VolumeSeekBarPreferenceTest.java

Change-Id: Ib96a588e4e186266433f7bda34429c8764f46933
parents bb0582e8 40795bae
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment