tree 7ad7565d811ace7ed36d9f37cdc629a9fb8a4842
parent 29433d8e7afc574efa243a32fb9bd506f5095cc4
parent d3bd739763e90807ca36b264972a6fafeecc6ef3
author Elliott Hughes <enh@google.com> 1453424625 +0000
committer android-build-merger <android-build-merger@google.com> 1453424625 +0000

Merge "sonivox: -Wno-unused-parameter." am: 825ad522d5
am: d3bd739763

* commit 'd3bd739763e90807ca36b264972a6fafeecc6ef3':
  sonivox: -Wno-unused-parameter.