ref: d4fccb8f4197485d72ddb1784bc3d8eb8968508d
parent: 0741629c8823e9f80862d0dffaaf2c44d429b91f
parent: 6042d68851dde2a2924cdc7dc09bd6e312f977b5
author: Tom Finegan <tomfinegan@google.com>
date: Mon May 9 17:24:11 EDT 2016
Merge "convolve_test: Fix IOC runtime errors."