tree d401b8f544ed9a4d6c55e347107ed8c2243cae1c
parent 12e9c004e5eae2f120efa7b6a609702fb19fe78e
parent bccbeb1bbb70ed6c417d86fad5adcf2f4a60df68
author Jiabin Huang <jiabin@google.com> 1526421085 -0700
committer android-build-merger <android-build-merger@google.com> 1526421085 -0700

Merge "Add support for manually set surround formats." into pi-dev am: eddc0d712c
am: bccbeb1bbb

Change-Id: I5bdce8b1103c970fd515028e48336fc26b9f2fbd