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

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

Android 14.0.0 release 29

# -----BEGIN PGP SIGNATURE-----
#
# iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCZeZW3wAKCRDorT+BmrEO
# eC1AAJ9x1JNl5rYKP+lcPexUqRglyhcmOwCdFz4+FfNp8nESyhQ0UR4X/78LCPg=
# =84rW
# -----END PGP SIGNATURE-----
# gpg: Signature made Tue Mar  5 01:18:55 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 2352 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 (51) and others
# Via Automerger Merge Worker (892) and others
* tag 'android-14.0.0_r29': (73 commits)
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE
  Change switches on resource IDs to if statements
  Remove @SortDimensionId
  Revert "Remove @SortDimensionId"
  Revert "Change switches on resource IDs to if statements"
  Revert "Build DocumentsUI sources once"
  Revert "Remove @SortDimensionId"
  Revert "Change switches on resource IDs to if statements"
  Revert "Build DocumentsUI sources once"
  Tweak perfetto_config.pbtx
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE
  Build DocumentsUI sources once
  Change switches on resource IDs to if statements
  Remove @SortDimensionId
  Add trace.sh for Perfetto tracing
  Import translations. DO NOT MERGE ANYWHERE
  ...

 Conflicts:
	src/com/android/documentsui/dirlist/DirectoryFragment.java
	src/com/android/documentsui/files/FilesActivity.java

Change-Id: Ia90f53e99c1380a5676dfe6c56f4716cd5ccf86e
parents 37068d76 2185a376
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