Android 14.0.0 release 29
# -----BEGIN PGP SIGNATURE-----
#
# iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCZeZWxAAKCRDorT+BmrEO
# eC+EAJ0aGQrbikU0Rc9r5KeLwPIqv7GvCwCdEbWUKnCwHeo8nyNqTrAXbc6UYEs=
# =DSu9
# -----END PGP SIGNATURE-----
# gpg: Signature made Tue Mar 5 01:18:28 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 2397 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 (65) and others
* tag 'android-14.0.0_r29':
Revert^2 "bramble(nfc): Modify NFC overlays for NFC apex"
Revert^2 "bramble(nfc): Modify NFC overlays for NFC apex"
Revert "bramble(nfc): Modify NFC overlays for NFC apex"
Revert "bramble(nfc): Modify NFC overlays for NFC apex"
Fix lunch choices for git_main
Fix lunch choices for git_main
bramble(nfc): Modify NFC overlays for NFC apex
Add BUILD_BROKEN_INCORRECT_PARTITION_IMAGES
usb: upgrade stats AIDL to v2
Add hardware/qcom/wlan namespace
Conflicts:
AndroidProducts.mk
bramble/BoardConfig.mk
Change-Id: Id3764e0a73e8f21b7d16aea8bd5a1765ded6b531
28191ac64a