tree 2651ac7e11a6ad0129c5357f7e643790e106c846
parent 3b7f469b1ead2428a50bf4049e32b7a81fb2b7f6
parent e83ac21bf2cf1c58d56bba030b0d05f6c15328cd
author Andy Hung <hunga@google.com> 1525800317 -0700
committer android-build-merger <android-build-merger@google.com> 1525800317 -0700

Merge "AudioMixer: Always do prepareForReformat() in setChannelMasks()" into pi-dev
am: e83ac21bf2

Change-Id: If0d24de9fef3e6eaa47c3e59225dfc97f339daf7