commit a1f5ec8ca22a24a4df703d354d0b66cde885ca6c
author Michael Bestas <mkbestas@lineageos.org> Fri Aug 25 10:18:51 2023 +0300
committer Michael Bestas <mkbestas@lineageos.org> Fri Aug 25 10:18:51 2023 +0300
tree 80a9fc2ab7fa40ca22100fed472e116a847e24c9
parent 3c8b041776c1a678ea6ceaaef108efe77166ff47
parent ce8c3b69c9b880978166eede761ff82b432f500a

Merge tag 'LA.UM.9.14.r1-22200-LAHAINA.QSSI14.0' into staging/lineage-20.0_merge-LA.UM.9.14.r1-22200-LAHAINA.QSSI14.0

"LA.UM.9.14.r1-22200-LAHAINA.QSSI14.0"

# By Gaviraju Doddabettahalli Bettegowda (1) and Zun Qiao (1)
# Via Gerrit - the friendly Code Review server (2) and Linux Build Service Account (1)
* tag 'LA.UM.9.14.r1-22200-LAHAINA.QSSI14.0':
  libstagefrighthw: Fix CFI issue for wma/ape playback
  media: blair: Enable Codec2 for HY11 builds

Change-Id: I3ab6ee9ecbce8014bf12adc37fd9835f7728698d