tree 2d6a3bcc8d0a284380c00cbfa624be803fae39f8
parent 12ec15e5b7c7f171cd3b1d3a5f9990fa6f5b4cf5
parent 8d31bc8f0eabf209e4769ed573674891a4d0a7f1
author Eric Laurent <elaurent@google.com> 1527015745 -0700
committer android-build-merger <android-build-merger@google.com> 1527015745 -0700

Merge changes from topic "audio-hal-vsid" into pi-dev am: 2e09fa6efd
am: 8d31bc8f0e

Change-Id: I5f950a3579b0c8a4968594863dc5ab2123570e2a