tree c1ab8528915bc2c6849f929cb7fd6d99ebb43695
parent ea3445f488663d289c39299acf18a9a4f5b23208
parent 2cf0953b4e4b970762b9c14b504b17eea4a8cf87
author Ray Essick <essick@google.com> 1568656997 -0700
committer android-build-merger <android-build-merger@google.com> 1568656997 -0700

Merge "Allow codec2/g711 codec to handle 6 channels" into qt-qpr1-dev
am: 2cf0953b4e

Change-Id: I0af77bbc7d1ddb2c05837e2ce6d6c03930392ca9