tree dde24124f34b7d77c7eac2c5c105d54140182f20
parent 31da944ced04f4a4e8aae1523ac9e47b01e74cf2
parent be83a90bac1a74fa7b21fcd6a05f315827ca941d
author Andy Hung <hunga@google.com> 1527114785 -0700
committer android-build-merger <android-build-merger@google.com> 1527114785 -0700

Merge "AudioMixer: recreate Resampler if the track channel count has changed" into pi-dev am: 292838cca7
am: be83a90bac

Change-Id: I7f5051deed0d459e0a1cae0919b976fd98bac3aa