tree 6bafec37fcb0a965a7074b47ebae3a1dac9c9560
parent 0621722162fd714b92efa561a5ea4fa8d4e51182
parent 35388b2b37c541a33064a52492a65a196701a673
author akirilov <akirilov@google.com> 1522794987 -0700
committer android-build-merger <android-build-merger@google.com> 1522794987 -0700

[automerger skipped] [automerger] sonivox: fix hang caused by bad meta-event am: ba9ea23466 am: 3983856ec1 am: 59644944e2 am: f3c51f7f1e am: d2901553df am: b0081b7c58 am: 88510ce7be am: ef8ae5940d am: 52fae8ba07 am: c315f9d3f6 am: 096edd76c8
am: 35388b2b37  -s ours

Change-Id: I19c481999ae31bb2b7aae488b40f59bab0e5ff25