commit | 7c6cfed3e7ea8bb6371872aa8700d8d1f01456f4 | [log] [tgz] |
---|---|---|
author | Lucas Wei <lucaswei@google.com> | Tue Jun 22 18:15:29 2021 +0800 |
committer | Lucas Wei <lucaswei@google.com> | Tue Jun 22 18:15:34 2021 +0800 |
tree | 8e1c8c0d72d8ca058457abdd5d031bbc52561849 | |
parent | 775a1421e388b988120671f4bb7c4bf0fe38f67c [diff] | |
parent | 3da6272ea2fdf0e8990de49fd37ff736b3a43ead [diff] |
Merge LA.UM.9.12.C10.11.00.00.840.010 via branch 'qcom-msm-4.19-7250-audio-drivers.lnx.4.0.r3' into android-msm-pixel-4.19 Conflicts: dsp/q6adm.c dsp/rtac.c include/dsp/q6adm-v2.h Bug: 187909050 Signed-off-by: Lucas Wei <lucaswei@google.com> Change-Id: I9261f1c48a33410da347a0ed29da4b93d4ec0ec9