tree 72e4f52ffcfc4e870e34be0e337c3a1bb5f21dba
parent bb3249264438604d874fd33bd19f20abbae67647
parent cf4098ed3ba7030b52c129db0dbb9d51b49384e6
author Fraunhofer IIS FDK <audio-fdk@iis.fraunhofer.de> 1546092736 -0800
committer android-build-merger <android-build-merger@google.com> 1546092736 -0800

Merge "QMF configuration flag QMF_FLAG_MPSLDFB has always priority over QMF_FLAG_CLDFB"
am: cf4098ed3b

Change-Id: I0166285d3129440c9caa444fe4fcfa9d59c1f6c1