Merge "encode_test_driver: test for failure prior to encode"
authorJames Zern <jzern@google.com>
Fri, 28 Aug 2015 20:31:01 +0000 (20:31 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Fri, 28 Aug 2015 20:31:01 +0000 (20:31 +0000)

Trivial merge