Files
device_google_redfin/usb
Michael Bestas 1df01c1fdd Merge tag 'android-14.0.0_r29' into staging/lineage-21_merge-android-14.0.0_r29
Android 14.0.0 release 29

# -----BEGIN PGP SIGNATURE-----
#
# iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCZeZWwgAKCRDorT+BmrEO
# eNE9AJ436si4iGfuXraq4i9WmLWWNa6Q4gCgjhDz+mf+NpY25sntQxSTVhlr4+o=
# =0XyA
# -----END PGP SIGNATURE-----
# gpg: Signature made Tue Mar  5 01:18:26 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 2395 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 Roshan Pius (5) and others
# Via Automerger Merge Worker (97) and others
* tag 'android-14.0.0_r29':
  Revert^2 "redfin(nfc): Modify NFC overlays for NFC apex"
  Revert^2 "redfin(nfc): Modify NFC overlays for NFC apex"
  Remove unused Android.mk under device/google/redfin
  WLC: update AIDL manifest version to 1-2
  Revert "WLC: update AIDL manifest version to 2"
  WLC: update AIDL manifest version to 2
  Revert "redfin(nfc): Modify NFC overlays for NFC apex"
  Revert "redfin(nfc): Modify NFC overlays for NFC apex"
  Fix lunch choices for git_main
  Fix lunch choices for git_main
  redfin(nfc): Modify NFC overlays for NFC apex
  Add BUILD_BROKEN_INCORRECT_PARTITION_IMAGES
  usb: upgrade stats AIDL to v2
  device FCM -= android.*
  Add hardware/qcom/wlan namespace

 Conflicts:
	AndroidProducts.mk
	redfin/BoardConfig.mk

Change-Id: Ie3cf1f67798757f4d6316141b6baf69e4b86ebb2
2024-03-10 09:52:12 +02:00
..