Merge "Adds a set of end-to-end encode tests"
authorDeb Mukherjee <debargha@google.com>
Thu, 16 Oct 2014 21:27:26 +0000 (14:27 -0700)
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>
Thu, 16 Oct 2014 21:27:26 +0000 (14:27 -0700)

Trivial merge