tree 90d810bbbd8d6acc5d88ff369b11f3397af78a48
parent ecba7fdd999225f21e7c1de6077d36302729c6bb
parent 57939192c3378e57d4af8509a086f58e9721a7c1
author Fraunhofer IIS FDK <audio-fdk@iis.fraunhofer.de> 1546093031 -0800
committer android-build-merger <android-build-merger@google.com> 1546093031 -0800

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

Change-Id: I799ffa0efb296051c963645e5070dfae67ef9b03